From: strO0pwafel <153459934+strO0pwafel@users.noreply.github.com> Date: Thu, 8 Aug 2024 10:04:19 +0000 (+0800) Subject: more consistent CentComm naming (#29217) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=35819e4ba5b600430d35301275132c36a8a2fd97;p=space-station-14.git more consistent CentComm naming (#29217) * first-commit * second commit * i think i get git kinda maybe * all of resources i think * last easy changes * oops * Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml --------- Co-authored-by: stroopwafel Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index b5eeafb0b3..91b8348f05 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -68,7 +68,7 @@ bounty-item-microwave-machine-board = Microwave machine board bounty-item-flash = Flash bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. -bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. +bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery. bounty-description-brain = Commander Caldwell was rendered brain-dead by a recent space lube accident. Unfortunately, we can't hire a replacement, so just send us a new brain to put in her instead. bounty-description-bread = Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions. @@ -78,9 +78,9 @@ bounty-description-carp = Admiral Pavlov has gone on strike ever since Central C bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more. bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it. bounty-description-crayon = Dr Jones' kid ate all our crayons again. Please send us yours. -bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom. -bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentCom immediately. -bounty-description-donut = CentCom's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale. +bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentComm. +bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentComm immediately. +bounty-description-donut = CentComm's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale. bounty-description-figurine = The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints. bounty-description-flesh-monster = We've recently receieved reports of some kind of flesh monster infestation onboard several stations. Send us a few samples of these creatures so we can investigate new botanical opportunities. bounty-description-flower = Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of flowers and he'll happily reward you. @@ -96,18 +96,18 @@ bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fr bounty-description-pancake = Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen. bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens. bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more. -bounty-description-pie = 3.14159? No! CentCom management wants edible pie! Ship a whole one. +bounty-description-pie = 3.14159? No! CentComm management wants edible pie! Ship a whole one. bounty-description-prison-uniform = Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands. bounty-description-radio = A recent solar flare has fried all of our communication devices. Send us a new set of radios for our engineering crew so we can repair the network. bounty-description-research-disk = Turns out those bozos in the Research department have been spending all their time getting janitorial equipment. Send some research up to Central Command so we can actually get what we need. bounty-description-shiv = Bzzzt... Transmission from prison planet OC-1001: we're facing an onslaught of uhm... "invaders." Yeah, invaders. Send us some shivs to fight them off with. -bounty-description-soap = Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs. +bounty-description-soap = Soap has gone missing from CentComm's bathrooms and nobody knows who took it. Replace it and be the hero CentComm needs. bounty-description-soup = To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup. -bounty-description-spear = CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears. +bounty-description-spear = CentComm's security forces are going through budget cuts. You will be paid if you ship a set of spears. bounty-description-syringe = The NT anti-drug task force is in need of some syringes in order to distribute them to low-income communities. Help some keep some peoples' jobs secure. bounty-description-toolbox = There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution. bounty-description-tech-disk = The new research assistant on Station 13 spilled a soda on the RND server. Send them some technology disks so they can build up their recipes. -bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation. +bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcomm wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation. bounty-description-anomaly-core = Suddenly we've run out of anomaly cores, including inert nuclei. Send us any anomaly cores so that we can continue to observe their final decay process. bounty-description-borg-module = Scientists at the neighboring station have only studied Borg production, not module production. They are stuck in the research process and need references to work from. Send any Borg modules to inspire your colleagues. bounty-description-artifact-fragment = Scientists at a nearby station are requesting artifact fragments for microxenoarchaeology studies. Ordinary artifacts are too large for their micro research platforms. Send some of the artifact fragments your sector is rich in. diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 6dc214fc10..79b98691b8 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -159,7 +159,7 @@ ghost-role-information-ert-medical-name = ERT Medical ghost-role-information-ert-medical-description = Assist with medical efforts to resolve the station's issues. ghost-role-information-cburn-agent-name = CBURN Agent -ghost-role-information-cburn-agent-description = A highly trained CentCom agent, capable of dealing with various threats. +ghost-role-information-cburn-agent-description = A highly trained CentComm agent, capable of dealing with various threats. ghost-role-information-centcom-official-name = CentComm official ghost-role-information-centcom-official-description = Perform CentComm related duties such as inspect the station, jotting down performance reviews for heads of staff, and managing the fax machine. diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index 5bacf512ea..44cdd0853d 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/Resources/Locale/en-US/headset/headset-component.ftl @@ -5,7 +5,7 @@ chat-radio-message-wrap-bold = [color={$color}]{$channel} [bold]{$name}[/bold] { examine-headset-default-channel = Use {$prefix} for the default channel ([color={$color}]{$channel}[/color]). chat-radio-common = Common -chat-radio-centcom = CentCom +chat-radio-centcom = CentComm chat-radio-command = Command chat-radio-engineering = Engineering chat-radio-medical = Medical diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 51a81fb06a..1b89be0133 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -20,7 +20,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 = CentComm 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 18f103bf80..c7dc1a1bda 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -2,7 +2,7 @@ stamp-component-stamped-name-default = A very important person stamp-component-stamped-name-detective = Detective stamp-component-stamped-name-mime = Mime stamp-component-stamped-name-captain = Captain -stamp-component-stamped-name-centcom = CentCom +stamp-component-stamped-name-centcom = CentComm stamp-component-stamped-name-chaplain = Chaplain stamp-component-stamped-name-lawyer = Lawyer stamp-component-stamped-name-clown = Clown diff --git a/Resources/Locale/en-US/prayers/prayers.ftl b/Resources/Locale/en-US/prayers/prayers.ftl index 313de6322f..f0e22eaadf 100644 --- a/Resources/Locale/en-US/prayers/prayers.ftl +++ b/Resources/Locale/en-US/prayers/prayers.ftl @@ -4,7 +4,7 @@ prayer-verbs-call = Call prayer-verbs-rub = Rub prayer-chat-notify-pray = PRAYER prayer-chat-notify-honkmother = HONKMOTHER -prayer-chat-notify-centcom = CENTCOM +prayer-chat-notify-centcom = CENTCOMM prayer-chat-notify-syndicate = SYNDICATE prayer-chat-notify-lamp = LAMP diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl index 2fa3a7a124..b4dcaa3e67 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 CentCom. +emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentComm. emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds. emergency-shuttle-docked = The Emergency Shuttle has docked {$direction} of the station, {$location}. 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/atlas.yml b/Resources/Maps/atlas.yml index 7bb91cde06..bdc2c9cd29 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -39890,7 +39890,7 @@ entities: parent: 30 - type: Paper content: >- - CentCom slashed the AME budget so we need to set up another engine now. Head into maintenance and then west, you'll find the engine and a guide for it. + CentComm slashed the AME budget so we need to set up another engine now. Head into maintenance and then west, you'll find the engine and a guide for it. As usual solars will still help out a lot. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 71d3f00df3..f174a61696 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -130,8 +130,8 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom - name: CentCom official costume duffel bag - description: "Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included." + name: CentComm official costume duffel bag + description: "Contains a full CentComm Official uniform set, headset and clipboard included. Encryption keys and ID access are not included." suffix: DO NOT MAP components: - type: Tag diff --git a/Resources/Prototypes/Datasets/Names/fortunes.yml b/Resources/Prototypes/Datasets/Names/fortunes.yml index fc3c5d9d71..b38e04dc61 100644 --- a/Resources/Prototypes/Datasets/Names/fortunes.yml +++ b/Resources/Prototypes/Datasets/Names/fortunes.yml @@ -24,7 +24,7 @@ - You will be pleasantly surprised in the tool storage. - There is an impostor among us. - A fun adventure awaits you in the maintenance tunnels. - - CentCom is proud of you! + - CentComm is proud of you! - The head of your deparment is proud of you! - Ian is proud of you! - Do it for Ian! @@ -58,7 +58,7 @@ - An apple a day keeps the doctor away. - Don't drink and set up singulo. - Stare into the singulo, and the singulo stares back at you. - - Every good and perfect gift is from CentCom. + - Every good and perfect gift is from CentComm. - There’s no such thing as Space Station 13. - There is a time for caution, but not for fear. - The smart thing to do is to begin trusting your intuitions. diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index df96274783..1e6195ad60 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -214,7 +214,7 @@ - BOTANY - BRAZIL - CANADA - - CENTCOM + - CENTCOMM - CHEMICAL LAB - CHINA - CLOWN PLANET @@ -917,7 +917,7 @@ - BOOGEYMEN - CAPITALISTS - CARP - - CENTCOM OFFICERS + - CENTCOMM OFFICERS - CLOWNS - COMMUNISTS - CORGIS diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index c5d0816b6d..04203cf357 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -78,7 +78,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCentCom - name: CentCom headset + name: CentComm headset description: A headset used by the upper echelons of Nanotrasen. components: - type: ContainerFill diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 9dd72691b5..0a1cf3fb88 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -29,7 +29,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCentCom - name: CentCom over-ear headset + name: CentComm over-ear headset components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 530c23a578..dd1bfd91bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -74,7 +74,7 @@ parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetAncient name: NTSRA void helmet - description: An ancient space helmet, designed by the NTSRA branch of CentCom. + description: An ancient space helmet, designed by the NTSRA branch of CentComm. components: - type: Sprite sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index b5d3b0ff3e..ad0662251a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -222,7 +222,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCentcom - name: CentCom brand hat + name: CentComm brand hat description: "It's good to be the emperor." components: - type: Sprite @@ -873,7 +873,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCentcomcap - name: CentCom cap + name: CentComm cap description: An extravagant, fancy Central Commander cap. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 125d183caa..de974f9d50 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -309,7 +309,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCentcom categories: [ HideSpawnMenu ] - name: Centcom winter coat hood + name: CentComm winter coat hood description: A hood for keeping the central comander's head warm. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index b222ed0d5a..8e621ebcdb 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -91,7 +91,7 @@ - type: entity parent: ClothingMaskGasAtmos id: ClothingMaskGasCentcom - name: CentCom gas mask + name: CentComm 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/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index 1f9d6b8b2c..f8c9f1fc9d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -111,8 +111,8 @@ - type: entity parent: ClothingScarfBase id: ClothingNeckScarfStripedCentcom - name: striped CentCom scarf - description: A stylish striped centcom colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. + name: striped CentComm scarf + description: A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. components: - type: Sprite sprite: Clothing/Neck/Scarfs/centcom.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 9db1ea2216..c61d09ee21 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -78,7 +78,7 @@ parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitAncientEVA name: NTSRA voidsuit #Nanotrasen Space Research Association - description: An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits. + description: An ancient space suit, designed by the NTSRA branch of CentComm. It is very finely crafted, allowing for greater mobility than most modern space suits. components: - type: Sprite sprite: Clothing/OuterClothing/Suits/ancient_voidsuit.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 5007b5a194..f4c960f31c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -167,7 +167,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterCentcom - name: CentCom winter coat + name: CentComm winter coat components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 1e7fa65f95..0bd8adc7ea 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -126,8 +126,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomAgent - name: CentCom agent's jumpsuit - description: A suit worn by CentCom's legal team. Smells of burnt coffee. + name: CentComm agent's jumpsuit + description: A suit worn by CentComm's legal team. Smells of burnt coffee. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_agent.rsi @@ -137,8 +137,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficial - name: CentCom official's jumpsuit - description: It's a jumpsuit worn by CentCom's officials. + name: CentComm official's jumpsuit + description: It's a jumpsuit worn by CentComm's officials. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi @@ -148,8 +148,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficer - name: CentCom officer's jumpsuit - description: It's a jumpsuit worn by CentCom Officers. + name: CentComm officer's jumpsuit + description: It's a jumpsuit worn by CentComm Officers. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi @@ -984,7 +984,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTEngineer name: ERT engineering uniform - description: A special suit made for the elite engineers under CentCom. + description: A special suit made for the elite engineers under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi @@ -995,7 +995,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTJanitor name: ERT janitorial uniform - description: A special suit made for the elite janitors under CentCom. + description: A special suit made for the elite janitors under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi @@ -1006,7 +1006,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTLeader name: ERT leader uniform - description: A special suit made for the best of the elites under CentCom. + description: A special suit made for the best of the elites under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi @@ -1017,7 +1017,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTMedic name: ERT medical uniform - description: A special suit made for the elite medics under CentCom. + description: A special suit made for the elite medics under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi @@ -1028,7 +1028,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTSecurity name: ERT security uniform - description: A special suit made for the elite security under CentCom. + description: A special suit made for the elite security under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index 0a2b4f80bb..95447e59d9 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. CentCom 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. CentComm 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/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 574f31dff3..a19d5bd56d 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -501,7 +501,7 @@ ## Central Command - type: entity - name: CentCom official + name: CentComm official id: RandomHumanoidSpawnerCentcomOfficial components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml index 5a45bff295..958c98f483 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml @@ -91,4 +91,4 @@ maxRange: 8 - type: WarpPoint follow: true - location: Ratvar \ No newline at end of file + location: Ratvar diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 04b023248e..faad961ebd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -639,7 +639,7 @@ - type: entity parent: BasePDA id: CentcomPDA - name: CentCom PDA + name: CentComm PDA description: Light green sign of walking bureaucracy. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index ad304a5bce..a2a6d2f51e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -263,7 +263,7 @@ parent: BasePlushie id: PlushieLizard #Weh! name: lizard plushie - description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" + description: An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" components: - type: Sprite state: plushie_lizard @@ -321,7 +321,7 @@ parent: BasePlushie id: PlushieSpaceLizard #ᵂᵉʰ! name: space lizard plushie - description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentCom as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" + description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" components: - type: Sprite state: plushie_spacelizard diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 18f64dd778..4cb6a8bf1e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -83,7 +83,7 @@ - type: entity id: BedsheetCentcom parent: BedsheetBase - name: CentCom bedsheet + name: CentComm 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/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 98ae7df9b3..ff207a5a2a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -580,7 +580,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Centcom Agent + jobTitle: Centcomm Agent - type: entity name: passenger ID card @@ -785,7 +785,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Centcom Quarantine Officer + jobTitle: Centcomm Quarantine Officer - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 617db53c4e..adb5776ec7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -410,10 +410,10 @@ - type: entity id: BoxFolderCentCom - name: CentCom folder + name: CentComm folder parent: BoxFolderBase suffix: DO NOT MAP - description: CentCom's miserable little pile of secrets! + description: CentComm's miserable little pile of secrets! components: - type: Sprite layers: @@ -482,8 +482,8 @@ - type: entity id: BoxFolderCentComClipboard parent: BoxFolderClipboard - name: CentCom clipboard - description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used. + name: CentComm clipboard + description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used. components: - type: Sprite sprite: Objects/Misc/cc-clipboard.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index e8f32252be..8680e414c3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -95,7 +95,7 @@ state: pen_cap - type: entity - name: CentCom pen + name: CentComm pen parent: CyberPen id: PenCentcom description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style. diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 975a554d52..e9052fa60e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -51,7 +51,7 @@ state: stamp-cap - type: entity - name: CentCom rubber stamp + name: CentComm rubber stamp parent: RubberStampBase id: RubberStampCentcom suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml index 849c9fa4f2..070e19cdbe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml @@ -72,7 +72,7 @@ - type: entity parent: FaxMachineBase id: FaxMachineCentcom - name: CentCom long range fax machine + name: CentComm long range fax machine suffix: CentCom components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 0555ce42b8..74e5a7a052 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1999,7 +1999,7 @@ parent: VendingMachine id: VendingMachineCentDrobe name: CentDrobe - description: A one-of-a-kind vending machine for all your centcom aesthetic needs! + description: A one-of-a-kind vending machine for all your centcomm aesthetic needs! components: - type: VendingMachine pack: CentDrobeInventory diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index c5b9b24a74..f1db2b71f1 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -180,7 +180,7 @@ parent: PosterBase id: PosterContrabandTools name: "Tools" - description: "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom." + description: "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm." components: - type: Sprite state: poster15_contraband @@ -243,7 +243,7 @@ parent: PosterBase id: PosterContrabandKosmicheskayaStantsiya name: "Kosmicheskaya Stantsiya 13 Does Not Exist" - description: "A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13." + description: "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13." components: - type: Sprite state: poster22_contraband @@ -351,7 +351,7 @@ parent: PosterBase id: PosterContrabandFreeDrone name: "Free Drone" - description: "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentCom." + description: "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentComm." components: - type: Sprite state: poster35_contraband @@ -468,7 +468,7 @@ parent: PosterBase id: PosterContrabandTheBigGasTruth name: "The Big Gas Giant Truth" - description: "Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOM?" + description: "Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOMM?" components: - type: Sprite state: poster48_contraband @@ -590,7 +590,7 @@ components: - type: Sprite state: poster62_contraband - + - type: entity parent: PosterBase id: PosterContrabandMissingSpacepen diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 26e598f121..c29641081b 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -509,7 +509,7 @@ - type: entity parent: [BaseThiefObjective, BaseLivingObjective] id: EscapeThiefShuttleObjective - name: Escape to centcom alive and unrestrained. + name: Escape to centcomm alive and unrestrained. description: You don't want your illegal activities to be discovered by anyone, do you? components: - type: Objective diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index edf191b420..a686925c33 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -38,7 +38,7 @@ - type: entity parent: [BaseTraitorObjective, BaseLivingObjective] id: EscapeShuttleObjective - name: Escape to centcom alive and unrestrained. + name: Escape to centcomm alive and unrestrained. description: One of our undercover agents will debrief you when you arrive. Don't show up in cuffs. components: - type: Objective @@ -84,7 +84,7 @@ - type: entity parent: [BaseTraitorObjective, BaseKillObjective] id: KillRandomPersonObjective - description: Do it however you like, just make sure they don't make it to centcom. + description: Do it however you like, just make sure they don't make it to centcomm. components: - type: Objective difficulty: 1.75 diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml index dad3b05135..d7278c7f4b 100644 --- a/Resources/ServerInfo/Guidebook/Glossary.xml +++ b/Resources/ServerInfo/Guidebook/Glossary.xml @@ -62,7 +62,7 @@ An Emergency Response Team. These may be dispatched by Central Command for a num A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops". ## God(s) -An IC term representing a Server Administrator. CentCom is also sometimes used in this manner. +An IC term representing a Server Administrator. CentComm is also sometimes used in this manner. ## Greytide/Greyshirt/Tider/Assistant Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes. @@ -120,7 +120,7 @@ Short for Security Officer. ## Shift In-Character way to refer to rounds. - + ## Singulo A shortening of the Singularity Engine. A Singulo can create infinite power for the station but is very dangerous. @@ -169,7 +169,7 @@ A phrase usually shouted in OOC when somebody reveals IC current round informati ## LOOC/OOC Local out-of-character and (global) out-of-character respectively. They are text channels that allow players to talk to other players outside of roleplay. LOOC is enabled during rounds, while OOC is typically only on after the round ends. - + ## LRP Low Roleplay. Servers marked LRP typically have relaxed roleplaying rules. @@ -184,7 +184,7 @@ A term for a player who engages in antagonist-like activity without actually bei ## Upstream The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream. - + ## Validhunter A player who hunts down "valids", as in people that are valid to kill, even though this person isn't security. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml index 62c88d58ce..9a4f62c5a8 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml @@ -14,7 +14,7 @@ Things you could do instead: - Say "haha did you see what just happened?" - - Say "god blew him up" or "centcom must have bluespaced a bomb to him" + - Say "god blew him up" or "centcomm must have bluespaced a bomb to him" - Point at cheese - Point at the cargo order console then emote "shoots finger guns"