Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace the new mentions of QM #858

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 6 additions & 2 deletions Resources/Prototypes/Datasets/ion_storm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 10 additions & 8 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -972,7 +974,7 @@
- type: AddAccentClothing
accent: ReplacementAccent
replacement: cowboy

- type: entity
parent: ClothingHeadHatCowboyBrown
id: ClothingHeadHatCowboyBlack
Expand All @@ -982,7 +984,7 @@
sprite: Clothing/Head/Hats/cowboyhatblack.rsi
- type: Clothing
sprite: Clothing/Head/Hats/cowboyhatblack.rsi

- type: entity
parent: ClothingHeadHatCowboyBrown
id: ClothingHeadHatCowboyGrey
Expand All @@ -992,7 +994,7 @@
sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
- type: Clothing
sprite: Clothing/Head/Hats/cowboyhatgrey.rsi

- type: entity
parent: ClothingHeadHatCowboyBrown
id: ClothingHeadHatCowboyRed
Expand All @@ -1002,7 +1004,7 @@
sprite: Clothing/Head/Hats/cowboyhatred.rsi
- type: Clothing
sprite: Clothing/Head/Hats/cowboyhatred.rsi

- type: entity
parent: ClothingHeadHatCowboyBrown
id: ClothingHeadHatCowboyWhite
Expand All @@ -1012,7 +1014,7 @@
sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
- type: Clothing
sprite: Clothing/Head/Hats/cowboyhatwhite.rsi

- type: entity
parent: ClothingHeadHatCowboyBrown
id: ClothingHeadHatCowboyBountyHunter
Expand Down Expand Up @@ -1076,4 +1078,4 @@
- type: Sprite
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_medic.rsi
sprite: Clothing/Head/Hats/beret_medic.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Resources/ServerInfo/Guidebook/Glossary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Loading