From 57e53dc3fb2a6cbdd420a7ffd76d34aebcefde1e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 19 Feb 2024 01:07:46 +0100 Subject: [PATCH] remove qm from existence Also now we have 2 LO beret. --- .../Prototypes/Catalog/Fills/Crates/cargo.yml | 4 +++- Resources/Prototypes/Datasets/ion_storm.yml | 8 ++++++-- .../Prototypes/Entities/Clothing/Head/hats.yml | 18 ++++++++++-------- .../Entities/Clothing/Uniforms/jumpsuits.yml | 6 ++++-- Resources/ServerInfo/Guidebook/Glossary.xml | 10 +++++----- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 0fe73de1377..b36eab6ba91 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -2,7 +2,9 @@ id: CrateCargoLuxuryHardsuit parent: CratePirate name: luxury mining hardsuit crate - description: Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking. + # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer + description: Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking. + # End of modified code components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 518e9accaea..0751582e3d6 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -342,8 +342,12 @@ - MIMES - PARAMEDICS - PASSENGERS - - QUARTERMASTERS - - RESEARCH DIRECTORS + # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer + - LOGISTICS OFFICERS + # End of modified code + # DeltaV - Epistemics Department - Replace Research Director with Mystagogue + - MYSTAGOGUES + # End of modified code - ROBOTICISTS - SALVAGE SPECIALISTS - SCIENTISTS diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 205b4ac16ff..d76f86a8599 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -104,8 +104,10 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretQM - name: quartermaster's beret - description: A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style. + # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer + name: logistics officer's beret + description: A beret with the logistics department's insignia emblazoned on it. For logistics officers that are more inclined towards style. + # End of modified code components: - type: Sprite sprite: Clothing/Head/Hats/beret_qm.rsi @@ -972,7 +974,7 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: cowboy - + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyBlack @@ -982,7 +984,7 @@ sprite: Clothing/Head/Hats/cowboyhatblack.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatblack.rsi - + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyGrey @@ -992,7 +994,7 @@ sprite: Clothing/Head/Hats/cowboyhatgrey.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatgrey.rsi - + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyRed @@ -1002,7 +1004,7 @@ sprite: Clothing/Head/Hats/cowboyhatred.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatred.rsi - + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyWhite @@ -1012,7 +1014,7 @@ sprite: Clothing/Head/Hats/cowboyhatwhite.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatwhite.rsi - + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyBountyHunter @@ -1076,4 +1078,4 @@ - type: Sprite sprite: Clothing/Head/Hats/beret_medic.rsi - type: Clothing - sprite: Clothing/Head/Hats/beret_medic.rsi \ No newline at end of file + sprite: Clothing/Head/Hats/beret_medic.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index df51b6438d1..7c38f720a35 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -496,8 +496,10 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMFormal - name: quartermasters's formal suit - description: Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion. + # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer + name: logistics officer's formal suit + description: Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion. + # End of modified code components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml index d93b7c40425..05d8d3e97c2 100644 --- a/Resources/ServerInfo/Guidebook/Glossary.xml +++ b/Resources/ServerInfo/Guidebook/Glossary.xml @@ -26,7 +26,7 @@ The main area of the security department. This is where prisoners are brought an Short for Captain. ## Cargonia -Reference to cargo declaring independance. Against the rules. +Reference to logistics declaring independance. Against the rules. ## CentCom/Central Command An administrative agency which oversees the Nanotrasen space station you inhabit. @@ -58,11 +58,11 @@ Kill on sight. Someone has commited such a serious crime that they are deemed no ## Perma Short for Permanent Brig. This is for the most serious crime and means that a prisoner will never be released. Most stations have a dedicated, seperate area of security for the permanent brig. -## RD -Short for Research Director, the head of the Science Department. +## MG +Short for Mystagogue, the head of the Epistemics Department. -## QM -Short for Quartermaster, the head of the Cargo department. +## LO +Short for Logistics Officer, the head of the Logistics department. ## 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.