diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs index 2f5cb1c010..cedde3fc14 100644 --- a/Content.Server/Announcements/AnnounceCommand.cs +++ b/Content.Server/Announcements/AnnounceCommand.cs @@ -11,7 +11,7 @@ namespace Content.Server.Announcements { public string Command => "announce"; public string Description => "Send an in-game announcement."; - public string Help => $"{Command} or {Command} to send announcement as centcomm."; + public string Help => $"{Command} or {Command} to send announcement as CentCom."; public void Execute(IConsoleShell shell, string argStr, string[] args) { var chat = IoCManager.Resolve().GetEntitySystem(); diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs index 177b8270fa..740376a666 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -254,7 +254,7 @@ namespace Content.Server.Shuttles.Systems var locked = shuttleFtl != null || Paused(shuttle!.Owner); // Can't cache it because it may have a whitelist for the particular console. - // Include paused as we still want to show centcomm. + // Include paused as we still want to show CentCom. foreach (var comp in EntityQuery(true)) { // Can't warp to itself or if it's not on the whitelist. diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs index f6519a829f..f1163a9008 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs @@ -65,7 +65,7 @@ public sealed partial class ShuttleSystem private static readonly Color DangerColor = Color.Red; /// - /// Have the emergency shuttles been authorised to launch at Centcomm? + /// Have the emergency shuttles been authorised to launch at CentCom? /// private bool _launchedShuttles; diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyShuttle.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyShuttle.cs index 4b0cc201ea..e4cd9d3484 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyShuttle.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyShuttle.cs @@ -25,7 +25,7 @@ namespace Content.Server.Shuttles.Systems; public sealed partial class ShuttleSystem { /* - * Handles the escape shuttle + Centcomm. + * Handles the escape shuttle + CentCom. */ [Dependency] private readonly IAdminLogManager _logger = default!; @@ -420,7 +420,7 @@ public sealed partial class ShuttleSystem _centcommMap = _mapManager.CreateMap(); _mapManager.SetMapPaused(_centcommMap.Value, true); - // Load Centcomm + // Load CentCom var centcommPath = _configManager.GetCVar(CCVars.CentcommMap); if (!string.IsNullOrEmpty(centcommPath)) @@ -433,7 +433,7 @@ public sealed partial class ShuttleSystem } else { - _sawmill.Info("No centcomm map found, skipping setup."); + _sawmill.Info("No CentCom map found, skipping setup."); } foreach (var comp in EntityQuery(true)) @@ -449,7 +449,7 @@ public sealed partial class ShuttleSystem // Load escape shuttle var (_, shuttle) = _loader.LoadBlueprint(_centcommMap.Value, component.EmergencyShuttlePath.ToString(), new MapLoadOptions() { - // Should be far enough... right? I'm too lazy to bounds check centcomm rn. + // Should be far enough... right? I'm too lazy to bounds check CentCom rn. Offset = new Vector2(500f + _shuttleIndex, 0f) }); diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 985e800e77..e65cc3144e 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -16,7 +16,7 @@ job-name-atmostech = atmospheric technician job-name-hop = head of personnel job-name-captain = captain job-name-serviceworker = service worker -job-name-centcomoff = centcom official +job-name-centcomoff = CentCom official job-name-reporter = reporter job-name-musician = musician job-name-librarian = librarian diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 1592c04989..46179663f8 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -1,7 +1,7 @@ stamp-component-stamped-name-default = A very important person stamp-component-stamped-name-mime = Mime stamp-component-stamped-name-captain = Captain -stamp-component-stamped-name-centcom = Centcom +stamp-component-stamped-name-centcom = CentCom stamp-component-stamped-name-chaplain = Chaplain stamp-component-stamped-name-clown = Clown stamp-component-stamped-name-cmo = Chief Medical Officer diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl index 4750dc11a4..e21f07ba79 100644 --- a/Resources/Locale/en-US/shuttles/emergency.ftl +++ b/Resources/Locale/en-US/shuttles/emergency.ftl @@ -11,7 +11,7 @@ emergency-shuttle-command-dock-desc = Calls the emergency shuttle and docks it t emergency-shuttle-command-launch-desc = Early launches the emergency shuttle if possible. # Emergency shuttle -emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at Centcomm. +emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentCom. emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds. emergency-shuttle-docked = The Emergency Shuttle has docked with the station on the {$direction} side. It will leave in {$time} seconds. emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a station. Good luck. diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index d846d79982..87501f9c18 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -58431,7 +58431,7 @@ entities: - uid: 5269 type: Memorial components: - - desc: A gift from Centcomm, declaring Lighthouse as one of their finest stations, with only the best of crew sent to maintain it. Someone seems to have vandalized the back of it with 'Greytide 4ever'... + - desc: A gift from CentCom, declaring Lighthouse as one of their finest stations, with only the best of crew sent to maintain it. Someone seems to have vandalized the back of it with 'Greytide 4ever'... name: Lighthouse Station Monument type: MetaData - pos: 14.5,-23.5 @@ -109480,7 +109480,7 @@ entities: - pos: -29.69801,-2.933305 parent: 100 type: Transform - - content: "Clean up this mess before we hire a mailman for your station proper!\n \n \n-CentComm\n" + - content: "Clean up this mess before we hire a mailman for your station proper!\n \n \n-CentCom\n" type: Paper - canCollide: False type: Physics diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 31ef874e3f..60fe57f230 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -128,7 +128,7 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom - name: Centcom official costume duffel bag + name: CentCom official costume duffel bag description: "Contains a full CentCom Official uniform set, headset and clipboard included. The headset comes without an encryption key." components: - type: StorageFill diff --git a/Resources/Prototypes/Datasets/news.yml b/Resources/Prototypes/Datasets/news.yml index b99d020b13..f0d232667e 100644 --- a/Resources/Prototypes/Datasets/news.yml +++ b/Resources/Prototypes/Datasets/news.yml @@ -20,7 +20,7 @@ - "'Here kitty kitty' no longer preferred tajaran retrieval technique." - "Man travels 7000 light years to retrieve lost hankie, 'It was my favourite'." - "New bowling lane that shoots mini-meteors at bowlers very popular." -# - "Guy gets tattoo of Tau Ceti on chest '[pick("CentComm","star","starship","asteroid")] tickles most'." +# - "Guy gets tattoo of Tau Ceti on chest '[pick("CentCom","star","starship","asteroid")] tickles most'." - "Skrell marries computer; wedding attended by 100 modems." - "Chef reports successfully using harmonica as cheese grater." - "Nanotrasen invents handkerchief that says 'Bless you' after sneeze." diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index f7ebe9ab08..628c1c06c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -43,7 +43,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCentCom - name: centcomm headset + name: CentCom headset description: A headset used by the upper echelons of Nanotrasen. components: - type: Headset diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 8961cec609..37ce4edd8c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -89,7 +89,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCentcom - name: centcom brand hat + name: CentCom brand hat description: "It's good to be the emperor." components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 4b3c714e9a..583c21f605 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -70,7 +70,7 @@ - type: entity parent: ClothingMaskGasAtmos id: ClothingMaskGasCentcom - name: centcom gas mask + name: CentCom gas mask description: Oooh, gold and green. Fancy! This should help as you sit in your office. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index a20929cafe..6f3a11694f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -70,7 +70,7 @@ - type: entity parent: ClothingOuterWinterCoat id: ClothingOuterWinterCentcom - name: centcom winter coat + name: CentCom winter coat components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 379666a410..0f03e9efd9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -98,7 +98,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficial - name: centcom official's jumpsuit + name: CentCom official's jumpsuit description: It's a jumpsuit worn by CentCom's officials. components: - type: Sprite @@ -109,7 +109,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficer - name: centcom officer's jumpsuit + name: CentCom officer's jumpsuit description: It's a jumpsuit worn by CentCom Officers. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml index a5bd9fc39d..cbea8d7c98 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml @@ -46,7 +46,7 @@ - type: GhostTakeoverAvailable makeSentient: false name: CBURN Agent - description: A highly trained Centcomm agent, capable of dealing with various threats. + description: A highly trained CentCom agent, capable of dealing with various threats. - type: entity parent: MobHumanBase diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index f368a48cd5..0b722bb951 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml @@ -2,7 +2,7 @@ name: space tick id: MobTick parent: SimpleSpaceMobBase - description: It's a space tick, watch out for its nasty bite. Centcomm reports that 90 percent of cargo leg amputations are due to space tick bites. + description: It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of cargo leg amputations are due to space tick bites. components: - type: InputMover - type: MobMover diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 02a3469a52..93263d25e4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -36,7 +36,7 @@ - NanoTrasen - type: entity - name: centcom official + name: CentCom official parent: MobHuman id: MobHumanCentcomOfficial components: @@ -44,7 +44,7 @@ sprite: Markers/jobs.rsi state: centcom - type: GhostTakeoverAvailable - name: centcom official + name: CentCom official description: Inspect the station, jot down performance reviews for heads of staff, bug the Captain. - type: Loadout prototype: CentcomGear diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 6b249d4eb3..84a3230a2c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -554,7 +554,7 @@ - type: entity parent: PassengerPDA id: CentcomPDA - name: centcom PDA + name: CentCom PDA description: Colored the numbing grey of bureaucracy. components: - type: PDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 6b79634d95..64a6fb9fb5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -78,7 +78,7 @@ - type: entity id: BedsheetCentcom parent: BedsheetBase - name: Centcom bedsheet + name: CentCom bedsheet description: Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml index c977b4db2b..b1cbf1316f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml @@ -1,7 +1,7 @@ - type: entity id: CargoPallet name: cargo pallet - description: Designates valid items to sell to Centcomm when a shuttle is recalled. + description: Designates valid items to sell to CentCom when a shuttle is recalled. parent: BaseStructure components: - type: CargoPallet diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index 52e8e3b3ac..e78ddcce7b 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -457,7 +457,7 @@ public sealed class $CLASS$ : Shared$CLASS$ { <data /> <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="Lidgren.Network" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /></ExcludeFilters></data> True - True + True True True True