diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs index b7b7cce48ea583..844d5b82d10473 100644 --- a/Content.Benchmarks/MapLoadBenchmark.cs +++ b/Content.Benchmarks/MapLoadBenchmark.cs @@ -47,7 +47,7 @@ public async Task Cleanup() } public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Origin", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" }; - + [ParamsSource(nameof(MapsSource))] public string Map; diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs index 3d1eb1723c31ec..08a2567f73eaf8 100644 --- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs @@ -30,7 +30,7 @@ protected override void Open() { stationName = gridMetaData.EntityName; } - + if (EntMan.TryGetComponent(Owner, out var comp) && comp.ShowLocation) _window.Set(stationName, gridUid, Owner); else diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index e05f99d856463c..b503999408f259 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -1251,7 +1251,7 @@ public StyleNano(IResourceCache resCache) : base(resCache) .Class(StyleClassItemStatusNotHeld) .Prop("font", notoSansItalic10) .Prop("font-color", ItemStatusNotHeldColor), - + Element() .Class(StyleClassCrewManifestGender) .Prop("font", notoSansItalic10) diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs index 659320553a5a6e..62620e24fefab8 100644 --- a/Content.Server/Announcements/AnnounceCommand.cs +++ b/Content.Server/Announcements/AnnounceCommand.cs @@ -50,7 +50,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args) shell.WriteLine("Sent!"); } - + public CompletionResult GetCompletion(IConsoleShell shell, string[] args) { switch (args.Length) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index a270e5a42d8d81..fbff670c324fc4 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -515,5 +515,3 @@ public record struct AntagSelectLocationEvent(ICommonSession? Session, Entity [ByRefEvent] public readonly record struct AfterAntagEntitySelectedEvent(ICommonSession? Session, EntityUid EntityUid, Entity GameRule, AntagSelectionDefinition Def); - - diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index c8d5c8e4595510..2b29de96eaba89 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -429,7 +429,7 @@ private void UpdateSlow(EntityUid uid, Solution solution) var minViscosity = 0f; /// declare a total viscosity variable var totalViscosity = 0f; - + /// for each reagent in the puddle, grab the reagent's information in the reagentProto variable. foreach (var (reagent, _) in solution.Contents) { @@ -439,10 +439,10 @@ private void UpdateSlow(EntityUid uid, Solution solution) /// do the opposite to minimum viscosity. minViscosity = Math.Min(minViscosity, reagentProto.Viscosity); } - + /// total viscosity is the average of all viscosities in the solution totalViscosity = maxViscosity + minViscosity; - + /// if totalviscosity is not zero, ensure that the uid has the speedmodifiercontactcomponent, and then modify its speed by the total viscosity if (totalViscosity != 0) { @@ -450,7 +450,7 @@ private void UpdateSlow(EntityUid uid, Solution solution) var speed = 1 - totalViscosity; _speedModContacts.ChangeModifiers(uid, speed, comp); } - + /// if totalviscosity *is* zero, remove the speedmodifiercontactcomponent, because it's not doing anything else { diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs index 7ee20fabdea953..abe3e59969f756 100644 --- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs +++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs @@ -16,7 +16,7 @@ protected override void Added(EntityUid uid, BluespaceArtifactRuleComponent comp return; base.Added(uid, component, gameRule, args); - + _announcer.SendAnnouncement( _announcer.GetAnnouncementId(args.RuleId), Filter.Broadcast(), diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs index 7c297e4bb343dd..7c190fd215c47e 100644 --- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs +++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs @@ -16,7 +16,7 @@ public sealed class RandomSentienceRule : StationEventSystem 0 ? groupList[0] : "???"; var kind2 = groupList.Count > 1 ? groupList[1] : "???"; var kind3 = groupList.Count > 2 ? groupList[2] : "???"; - + _announcer.SendAnnouncement( _announcer.GetAnnouncementId(args.RuleId), Filter.Broadcast(), diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs index 3ad43779eb1976..ddc8a0c69e9477 100644 --- a/Content.Server/StationEvents/Events/VentClogRule.cs +++ b/Content.Server/StationEvents/Events/VentClogRule.cs @@ -18,7 +18,7 @@ public sealed class VentClogRule : StationEventSystem { [Dependency] private readonly SmokeSystem _smoke = default!; [Dependency] private readonly AnnouncerSystem _announcer = default!; - + protected override void Added(EntityUid uid, VentClogRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { base.Added(uid, component, gameRule, args); diff --git a/Content.Shared/Excretion/ExcretionComponent.cs b/Content.Shared/Excretion/ExcretionComponent.cs index 6ed92f9d132e6f..63e5ddfd0eb44d 100644 --- a/Content.Shared/Excretion/ExcretionComponent.cs +++ b/Content.Shared/Excretion/ExcretionComponent.cs @@ -55,25 +55,25 @@ public sealed partial class ExcretionComponent : Component [ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] public ThirstThreshold MinThirstThreshold = ThirstThreshold.Okay; - + /// /// The amount of slowdown applied to snails. /// [DataField("snailSlowdownModifier"), ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] public float SnailSlowdownModifier = 0.5f; - + /// The reagent to be spilled. [DataField("excretedReagent")] [ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] public string ExcretedReagent = "Mucin"; - + /// /// The amount of reagent to be spilled. /// [DataField("excretedVolume"), ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] public float ExcretedVolume = 15f; - + } diff --git a/Content.Shared/Excretion/ExcretionSystem.cs b/Content.Shared/Excretion/ExcretionSystem.cs index a8e12627943600..8742639570799e 100644 --- a/Content.Shared/Excretion/ExcretionSystem.cs +++ b/Content.Shared/Excretion/ExcretionSystem.cs @@ -107,7 +107,7 @@ private void OnExcretionDoAfter(EntityUid uid, ExcretionComponent comp, Excretio { /* /// if there aren't values for the desired reagent and its volume, don't do anything. - if ((comp.ExcretedReagent != "") && + if ((comp.ExcretedReagent != "") && (comp.ExcretedVolume !<= 0)) { */ @@ -121,7 +121,7 @@ private void OnExcretionDoAfter(EntityUid uid, ExcretionComponent comp, Excretio args.Repeat = false; } - + } /// @@ -134,4 +134,3 @@ public sealed partial class ExcretionActionEvent : InstantActionEvent { } /// [Serializable, NetSerializable] public sealed partial class ExcretionDoAfterEvent : SimpleDoAfterEvent { } - diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs index f335e31a657e57..882b358fbd7683 100644 --- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs @@ -200,13 +200,13 @@ private void UpdateEffects(EntityUid uid, ThirstComponent component) throw new ArgumentOutOfRangeException($"No thirst threshold found for {component.CurrentThirstThreshold}"); } } - + /// a check that returns if the entity is below a thirst threshold (used in Excretion system) public bool IsThirstBelowState(EntityUid uid, ThirstThreshold threshold, float? drink = null, ThirstComponent? comp = null) { if (!Resolve(uid, ref comp)) return false; // If entity does not have the ability to be thirsty, don't check it. - + return GetThirstThreshold (comp) < threshold; } diff --git a/Content.Shared/SnailSpeed/SnailSpeedSystem.cs b/Content.Shared/SnailSpeed/SnailSpeedSystem.cs index fb91a2c8f248cf..439b9c5f8e1c9d 100644 --- a/Content.Shared/SnailSpeed/SnailSpeedSystem.cs +++ b/Content.Shared/SnailSpeed/SnailSpeedSystem.cs @@ -24,19 +24,19 @@ public override void Initialize() SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnRefreshMovespeed); } - + private void OnMapInit(EntityUid uid, SnailSpeedComponent comp, MapInitEvent args) { _movementSpeedModifier.RefreshMovementSpeedModifiers(uid); } - + /// apply constant movespeed modifier as long as entity is not flying private void OnRefreshMovespeed(EntityUid uid, SnailSpeedComponent component, RefreshMovementSpeedModifiersEvent args) { if (_jetpack.IsUserFlying(uid)) return; - - + + args.ModifySpeed(component.SnailSlowdownModifier, component.SnailSlowdownModifier); } diff --git a/Resources/Locale/en-US/accent/gray.ftl b/Resources/Locale/en-US/accent/gray.ftl index 5f8959a489480a..cedbbc77a71707 100644 --- a/Resources/Locale/en-US/accent/gray.ftl +++ b/Resources/Locale/en-US/accent/gray.ftl @@ -225,7 +225,7 @@ accent-gray-words-replace-75 = jamga accent-gray-words-76 = coming accent-gray-words-replace-76 = ouuti - + accent-gray-words-77 = what accent-gray-words-replace-77 = seben @@ -250,7 +250,7 @@ accent-gray-words-replace-83 = tek accent-gray-words-84 = your accent-gray-words-replace-84 = mou -accent-gray-words-85 = be +accent-gray-words-85 = be accent-gray-words-replace-85 = zooti accent-gray-words-86 = grab @@ -271,7 +271,7 @@ accent-gray-words-replace-90 = milx accent-gray-words-91 = motherfucker accent-gray-words-replace-91 = jambupisk -accent-gray-words-92 = was +accent-gray-words-92 = was accent-gray-words-replace-92 = thikee accent-gray-words-93 = out @@ -313,7 +313,7 @@ accent-gray-words-replace-104 = sporp accent-gray-words-105 = ways accent-gray-words-replace-105 = spop -accent-gray-words-106 = are +accent-gray-words-106 = are accent-gray-words-replace-106 = zazz accent-gray-words-107 = pussy @@ -328,7 +328,7 @@ accent-gray-words-replace-109 = tronk accent-gray-words-110 = to accent-gray-words-replace-110 = blagh -accent-gray-words-111 = too +accent-gray-words-111 = too accent-gray-words-replace-111 = blaagh accent-gray-words-112 = one @@ -382,7 +382,7 @@ accent-gray-words-replace-127 = ziip accent-gray-words-128 = also accent-gray-words-replace-128 = frup -accent-gray-words-129 = and +accent-gray-words-129 = and accent-gray-words-replace-129 = pib accent-gray-words-130 = as @@ -409,7 +409,7 @@ accent-gray-words-replace-136 = zii accent-gray-words-137 = find accent-gray-words-replace-137 = bli -accent-gray-words-138 = then +accent-gray-words-138 = then accent-gray-words-replace-138 = zwep accent-gray-words-139 = hi @@ -475,11 +475,11 @@ accent-gray-words-replace-158 = glormun accent-gray-words-159 = having accent-gray-words-replace-159 = buugo -accent-gray-words-160 = has +accent-gray-words-160 = has accent-gray-words-replace-160 = beeg accent-gray-words-161 = fixed -accent-gray-words-replace-161 = yuumba +accent-gray-words-replace-161 = yuumba accent-gray-words-162 = fixing accent-gray-words-replace-162 = yoombun @@ -538,7 +538,7 @@ accent-gray-words-replace-179 = glurm accent-gray-words-180 = drinking accent-gray-words-replace-180 = sipsun -accent-gray-words-181 = drunk +accent-gray-words-181 = drunk accent-gray-words-replace-181 = supsi accent-gray-words-182 = came @@ -557,7 +557,7 @@ accent-gray-words-186 = powering accent-gray-words-replace-186 = grambun accent-gray-words-187 = spaced -accent-gray-words-replace-187 = urth +accent-gray-words-replace-187 = urth accent-gray-words-188 = spacing accent-gray-words-replace-188 = erthun @@ -687,4 +687,3 @@ accent-gray-words-replace-230 = dum jut accent-gray-words-231 = hello accent-gray-words-replace-231 = oum - diff --git a/Resources/Locale/en-US/markings/gray.ftl b/Resources/Locale/en-US/markings/gray.ftl index 57e1f11a5545f8..cb037d929fad03 100644 --- a/Resources/Locale/en-US/markings/gray.ftl +++ b/Resources/Locale/en-US/markings/gray.ftl @@ -3,4 +3,3 @@ marking-GrayCuteEyes = Gray Eyes (Cute) marking-GrayCoolEyes-eyes_cool = Gray Eyes (Cool) marking-GrayCoolEyes = Gray Eyes (Cool) - diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index 1d5c2f669072a4..0d179c4d4f2029 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -32,4 +32,4 @@ reagent-name-grey-matter = grey matter reagent-desc-grey-matter = Thought juice, the stuff that leaks out of your ears. reagent-name-mucin = mucin -reagent-desc-mucin = A fascinating secretion capable of accelerating the movement of anyone walking on it. +reagent-desc-mucin = A fascinating secretion capable of accelerating the movement of anyone walking on it. diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index 524c3eea778ffe..bf90b1ab93a4b0 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -14,4 +14,3 @@ species-name-snail = Gastropoid ## Misc species things snail-hurt-by-salt-popup = The salty solution burns like acid! - diff --git a/Resources/Maps/boat.yml b/Resources/Maps/boat.yml index 0831675cae7b37..f9b865d8111436 100644 --- a/Resources/Maps/boat.yml +++ b/Resources/Maps/boat.yml @@ -99474,7 +99474,7 @@ entities: prize rows cost - 1: 50,000 + 1: 50,000 2: 150,000 @@ -99791,7 +99791,7 @@ entities: █ ▀█     █     <3[/color] - ─────────────────────────────────────── + ─────────────────────────────────────── Each NT Officaly approved passenger is to be given 10,000. diff --git a/Resources/Prototypes/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/Catalog/Jukebox/Standard.yml index 7bef59ca7eddb7..497a2f184db261 100644 --- a/Resources/Prototypes/Catalog/Jukebox/Standard.yml +++ b/Resources/Prototypes/Catalog/Jukebox/Standard.yml @@ -185,13 +185,13 @@ path: /Audio/Jukebox/you_blow_my_mind.ogg - type: jukebox - id: TheNomai + id: TheNomai name: Andrew Prahlow - The Nomai path: path: /Audio/Jukebox/the_nomai.ogg - type: jukebox - id: TheFluteTune + id: TheFluteTune name: J-Cut & Kolt Siewerts - The Flute Tune (Soulpride Remix) path: path: /Audio/Jukebox/the_flute_tune.ogg diff --git a/Resources/Prototypes/Datasets/Names/snail_last.yml b/Resources/Prototypes/Datasets/Names/snail_last.yml index 3018eb61ad9271..972585c6bdf28b 100644 --- a/Resources/Prototypes/Datasets/Names/snail_last.yml +++ b/Resources/Prototypes/Datasets/Names/snail_last.yml @@ -13,4 +13,3 @@ - Cowrie - Natici - Glossa - diff --git a/Resources/Prototypes/Decals/rainbowsign.yml b/Resources/Prototypes/Decals/rainbowsign.yml index d280633803e7d5..9324fb12fe2a3b 100644 --- a/Resources/Prototypes/Decals/rainbowsign.yml +++ b/Resources/Prototypes/Decals/rainbowsign.yml @@ -46,5 +46,3 @@ sprite: sprite: Decals/rainbowsign.rsi state: rainbow7 - - diff --git a/Resources/Prototypes/Decals/signs.yml b/Resources/Prototypes/Decals/signs.yml index 66e318ac05d3d1..ba702ccb2a1807 100644 --- a/Resources/Prototypes/Decals/signs.yml +++ b/Resources/Prototypes/Decals/signs.yml @@ -109,4 +109,3 @@ sprite: sprite: Decals/signs.rsi state: security - diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index b55d7f6834e852..647b1849f5a74c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -994,4 +994,3 @@ prototypes: - MobBros - MobSorb - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 6235783089c3ac..b9fd111107e1f9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -1062,4 +1062,3 @@ interactFailureString: petting-failure-bear interactSuccessSound: path: /Audio/Animals/sloth_squeak.ogg - diff --git a/Resources/Prototypes/Entities/Mobs/Species/gray.yml b/Resources/Prototypes/Entities/Mobs/Species/gray.yml index 98e1c19a311ceb..78b47d9c00aa64 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/gray.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/gray.yml @@ -80,4 +80,3 @@ components: - type: Sprite scale: 1, 0.8 - diff --git a/Resources/Prototypes/Entities/Mobs/Species/snail.yml b/Resources/Prototypes/Entities/Mobs/Species/snail.yml index 7666d98c6c4170..85d8d0b08af56f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/snail.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/snail.yml @@ -224,4 +224,3 @@ 32: sprite: Mobs/Species/Snail/displacement.rsi state: mask - diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 0e46124b1c8b00..5c4a47ee5f49f8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -167,7 +167,7 @@ - ReagentId: Nutriment Quantity: 3 - ReagentId: TeriyakiSauce - Quantity: 1 + Quantity: 1 - type: Sprite state: teriyaki diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index d2aeb56443a389..52167e6afaf8f4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -216,7 +216,7 @@ - state: fax-machine - type: Flatpack entity: FaxMachineBase - + - type: entity parent: BaseFlatpack id: ChemMasterFlatpack diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index 1588ae27c6fa94..adde2d1d23fe8b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -54,4 +54,3 @@ id: BrownScarf equipment: neck: ClothingNeckScarfStripedBrown - diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index 5b6e37e4aaf32a..86fb57b2cc0728 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -54,7 +54,7 @@ id: BartenderWintercoat equipment: outerClothing: ClothingOuterWinterBar - + # Trinket - type: loadout id: ChemMasterFlatpack @@ -64,4 +64,3 @@ storage: back: - ChemMasterFlatpack - diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index cce5e0022d2093..3c3b4f6c3cc08c 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -58,4 +58,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - diff --git a/Resources/Prototypes/NPCs/mob.yml b/Resources/Prototypes/NPCs/mob.yml index 19fb5b6e8ece4f..ae6228ab988d5f 100644 --- a/Resources/Prototypes/NPCs/mob.yml +++ b/Resources/Prototypes/NPCs/mob.yml @@ -90,7 +90,7 @@ - tasks: - !type:HTNCompoundTask task: IdleCompound - + - type: htnCompound id: NiceCarpCompound branches: diff --git a/Resources/Prototypes/NPCs/securitron.yml b/Resources/Prototypes/NPCs/securitron.yml index bba0ecc794bc77..e81a539542d79c 100644 --- a/Resources/Prototypes/NPCs/securitron.yml +++ b/Resources/Prototypes/NPCs/securitron.yml @@ -4,5 +4,3 @@ - tasks: - !type:HTNCompoundTask task: IdleCompound - - diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 08e661d78e4c18..1dcdc29547e342 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -2113,7 +2113,7 @@ - !type:MobStateCondition mobstate: Alive fizziness: 0.2 - + - type: reagent id: GatorWine name: reagent-name-gatorwine @@ -2123,7 +2123,7 @@ flavor: sweet color: "#ffee3e" fizziness: 0.8 - + - type: reagent id: Rotgut name: reagent-name-rotgut @@ -2154,7 +2154,7 @@ - !type:MobStateCondition mobstate: Alive fizziness: 0 - + - type: reagent id: BumWine name: reagent-name-bumwine @@ -2164,7 +2164,7 @@ flavor: sweet color: "#e74f4f" fizziness: 0.9 - + - type: reagent id: VoxRocks name: reagent-name-voxrocks @@ -2186,7 +2186,7 @@ reagent: Oxygen amount: -25 fizziness: .7 - + - type: reagent id: JungleJuice name: reagent-name-junglejuice @@ -2196,7 +2196,7 @@ flavor: spaceshroom color: "#310b01" fizziness: 0.8 - + - type: reagent id: TheDrink name: reagent-name-drinkdrink diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index a906ebfcd27c71..fc4c7a7322652a 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -265,7 +265,7 @@ physicalDesc: reagent-physical-desc-fizzy flavor: metallic color: "#66538F" - + - type: reagent id: KingSoda name: reagent-name-kingsoda diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index a844db06a78711..bedc25b303e903 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -1227,7 +1227,7 @@ amount: 1 products: Calimotxo: 2 - + - type: reaction id: LoveTap requiredMixerCategories: @@ -1239,7 +1239,7 @@ amount: 9 products: LoveTap: 10 - + - type: reaction id: Raeganomics requiredMixerCategories: @@ -1255,7 +1255,7 @@ amount: 2 products: Reaganomics: 5 - + - type: reaction id: GatorWine requiredMixerCategories: @@ -1267,7 +1267,7 @@ amount: 1 products: GatorWine: 2 - + - type: reaction id: Rotgut requiredMixerCategories: @@ -1281,7 +1281,7 @@ amount: 5 products: Rotgut: 10 - + - type: reaction id: BumWine requiredMixerCategories: @@ -1295,7 +1295,7 @@ amount: 3 products: BumWine: 5 - + - type: reaction id: VoxRocks requiredMixerCategories: @@ -1307,7 +1307,7 @@ amount: 5 products: VoxRocks: 10 - + - type: reaction id: KingSoda reactants: @@ -1347,7 +1347,7 @@ amount: 1.5 products: KingSoda: 20 - + - type: reaction id: JungleJuice reactants: @@ -1375,7 +1375,7 @@ amount: 1 products: JungleJuice: 10 - + - type: reaction id: TheDrink reactants: diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index 5b4bc9ebd6fb81..693826c818e900 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -99,12 +99,12 @@ - type: reaction id: PropulsionGel minTemp: 370 - reactants: - Mucin: + reactants: + Mucin: amount: 1 - SpaceLube: + SpaceLube: amount: 2 - Tricordrazine: + Tricordrazine: amount: 2 products: PropulsionGel: 5 diff --git a/Resources/Prototypes/Species/gray.yml b/Resources/Prototypes/Species/gray.yml index f10e8ab3b344b5..5254ab30796be9 100644 --- a/Resources/Prototypes/Species/gray.yml +++ b/Resources/Prototypes/Species/gray.yml @@ -21,7 +21,7 @@ - type: speciesBaseSprites id: MobGraySprites sprites: - Head: MobGrayHead + Head: MobGrayHead Chest: MobGrayTorso Eyes: MobGrayEyes LArm: MobGrayLArm @@ -39,7 +39,7 @@ points: Head: points: 1 - required: true + required: true defaultMarkings: [ GrayCuteEyes ] HeadTop: points: 0 diff --git a/Resources/Prototypes/bar_signs.yml b/Resources/Prototypes/bar_signs.yml index 5ac455a30a194d..d7afbc4282f527 100644 --- a/Resources/Prototypes/bar_signs.yml +++ b/Resources/Prototypes/bar_signs.yml @@ -189,4 +189,3 @@ sprite: Structures/Wallmounts/barsign.rsi state: spacebucks description: barsign-prototype-description-spacebucks - diff --git a/Resources/ServerInfo/Guidebook/Mobs/Snail.xml b/Resources/ServerInfo/Guidebook/Mobs/Snail.xml index b5fcf0beb89a82..f19dadc0cd4bc0 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Snail.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Snail.xml @@ -4,21 +4,21 @@ - They depend on moisture to survive, so anything which contains table salt will damage them when splashed, ingested, or injected (including Saline.) + They depend on moisture to survive, so anything which contains table salt will damage them when splashed, ingested, or injected (including Saline.) - - They move slower than other species and can't wear shoes, but are unable to be slipped. + + They move slower than other species and can't wear shoes, but are unable to be slipped. - + They can't wear back-slot items (including backpacks, satchels and duffel bags,) instead preferring to store items in their shell. - + They take [color=#1e90ff]20% less damage from blunt and slash,[/color] but [color=#ffa500]50% more damage from heat and cold, and 20% more damage from poison.[/color] ## Slime Trail