Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
FluffiestFloof authored Oct 18, 2023
1 parent ecc7c5c commit 6fcebdb
Show file tree
Hide file tree
Showing 30 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ job-name-botanist = Botanist
job-name-bartender = Bartender
job-name-passenger = Passenger
job-name-salvagespec = Salvage specialist
job-name-qm = Head of Logistics
job-name-qm = Logistics Officer
job-name-cargotech = Cargo Technician
job-name-chef = Chef
job-name-clown = Clown
Expand Down Expand Up @@ -83,7 +83,7 @@ JobMusician = Musician
JobParamedic = Paramedic
JobPassenger = Passenger
JobPsychologist = Psychologist
JobQuartermaster = Head of Logistics
JobQuartermaster = Logistics Officer
JobReporter = Reporter
JobResearchAssistant = Research Assistant
JobResearchDirector = Mystagogue
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ job-supervisors-hos = the head of security
job-supervisors-ce = the chief engineer
job-supervisors-cmo = the chief medical officer
job-supervisors-rd = the mystagogue
job-supervisors-qm = the head of logistics
job-supervisors-qm = the logistics officer
job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ stamp-component-stamped-name-denied = DENIED
stamp-component-stamped-name-approved = APPROVED
stamp-component-stamped-name-hop = Head of Personnel
stamp-component-stamped-name-hos = Head of Security
stamp-component-stamped-name-qm = Head of Logistics
stamp-component-stamped-name-qm = Logistics Officer
stamp-component-stamped-name-rd = Mystagogue
stamp-component-stamped-name-warden = Warden
stamp-component-stamped-name-trader = Trader
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ id-card-access-level-medical = Medical
id-card-access-level-chemistry = Chemistry
id-card-access-level-paramedic = Paramedic
id-card-access-level-quartermaster = Head of Logistics
id-card-access-level-quartermaster = Logistics Officer
id-card-access-level-cargo = Logistics
id-card-access-level-salvage = Salvage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-CrateCargoLuxuryHardsuit = luxury mining hardsuit crate
.desc = Finally, a hardsuit the Head of Logistics could call their own. Centcomm has heard you, now stop asking.
.desc = Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking.
2 changes: 1 addition & 1 deletion Resources/Maps/pebble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31813,7 +31813,7 @@ entities:
- pos: 16.5,-6.5
parent: 2
type: Transform
- name: HoL
- name: LO
type: FaxMachine
- uid: 4953
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- id: RubberStampQm
- id: ClothingHeadsetAltCargo
- id: BoxEncryptionKeyCargo
- id: SpaceCashLuckyBill # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
- id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
- id: BoxPDACargo # Delta-V

- type: entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: entity
parent: BaseItem
id: SpaceCashLuckyBill
name: head of logistics' lucky bill
description: The first bill ever earned by the Head of Logistics from trading. A small chip is embedded in it.
name: logistics officer's lucky bill
description: The first bill ever earned by the Logistics Officer from trading. A small chip is embedded in it.
components:
- type: Sprite
sprite: DeltaV/Objects/Misc/first_bill.rsi
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/DeltaV/Objectives/traitor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity # Head of Logistics steal objective.
- type: entity # Logistics Officer steal objective.
noSpawn: true
parent: BaseTraitorStealObjective
id: HoLLuckyBillStealObjective
id: LOLuckyBillStealObjective
components:
- type: NotJobRequirement
job: Quartermaster
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
- type: entity
parent: ClothingHeadsetCargo
id: ClothingHeadsetQM
name: hol headset # DeltaV - Logistics Department replacing Cargo
description: A headset used by the head of logistics. # DeltaV - Logistics Department replacing Cargo
name: logistics officer's headset # DeltaV - Logistics Department replacing Cargo
description: A headset used by the logistics officer. # DeltaV - Logistics Department replacing Cargo
components:
- type: ContainerFill
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltCargo
name: head of logistics' over-ear headset # DeltaV - Logistics Department replacing Cargo
name: logistics officer's over-ear headset # DeltaV - Logistics Department replacing Cargo
components:
- type: ContainerFill
containers:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
parent: ClothingHeadHatHoodWinterBase
id: ClothingHeadHatHoodWinterQM
noSpawn: true
name: head of logistics' coat hood # DeltaV - Logistics Department replacing Cargo
name: logistics officer's coat hood # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatQMsoft
name: head of logistics' cap # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in the Head of Logistics' colors."
name: logistics officer's cap # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in the Logistics Officer's colors."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft.rsi
Expand All @@ -61,8 +61,8 @@
- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatQMsoftFlipped
name: head of logistics' cap flipped # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in the Head of Logistics' colors. Flipped."
name: logistics officer's cap flipped # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in the Logistics Officer's colors. Flipped."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakQm
name: head of logistics' cloak # DeltaV - Logistics Department replacing Cargo
name: logistics officer's cloak # DeltaV - Logistics Department replacing Cargo
description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills.
components:
- type: Sprite
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleQM
name: head of logistics' mantle # DeltaV - Logistics Department replacing Cargo
name: logistics officer's mantle # DeltaV - Logistics Department replacing Cargo
description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority!
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738
name: luxury mining hardsuit
description: A refurbished mining hardsuit, fashioned after the Head of Logistics' colors. Graphene lining provides less protection, but is much easier to move. # DeltaV - Logistics Department replacing Cargo
description: A refurbished mining hardsuit, fashioned after the Logistics Officer's colors. Graphene lining provides less protection, but is much easier to move. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterQM
name: head of logistics' winter coat # DeltaV - Logistics Department replacing Cargo
name: logistics officer's winter coat # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtQM
name: head of logistics' jumpskirt # DeltaV - Logistics Department replacing Cargo
name: logistics officer's jumpskirt # DeltaV - Logistics Department replacing Cargo
description: 'What can brown do for you?'
components:
- type: Sprite
Expand All @@ -296,7 +296,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtQMTurtleneck
name: head of logistics' turtleneck # DeltaV - Logistics Department replacing Cargo
name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo
description: A sharp turtleneck made for the hardy work environment of supply.
components:
- type: Sprite
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitQM
name: head of logistics' jumpsuit # DeltaV - Logistics Department replacing Cargo
name: logistics officer's jumpsuit # DeltaV - Logistics Department replacing Cargo
description: 'What can brown do for you?'
components:
- type: Sprite
Expand All @@ -460,7 +460,7 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitQMTurtleneck
name: head of logistics' turtleneck # DeltaV - Logistics Department replacing Cargo
name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo
description: A sharp turtleneck made for the hardy work environment of supply.
components:
- type: Sprite
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
- type: entity
id: SpawnPointQuartermaster
parent: SpawnPointJobBase
name: head of logistics # DeltaV - Logistics Department replacing Cargo
name: logistics officer # DeltaV - Logistics Department replacing Cargo
components:
- type: SpawnPoint
job_id: Quartermaster
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
state: pda-chaplain

- type: entity
name: head of logistics PDA # DeltaV - Logistics Department replacing Cargo
name: logistics officer PDA # DeltaV - Logistics Department replacing Cargo
parent: BasePDA
id: QuartermasterPDA
description: PDA for the guy that directs logistics. # DeltaV - Logistics Department replacing Cargo
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Fun/figurines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
- type: entity
parent: BaseFigurine
id: ToyFigurineQuartermaster
name: head of logistics figure # DeltaV - Logistics Department replacing Cargo
name: logistics officer figure # DeltaV - Logistics Department replacing Cargo
description: A figurine depicting the glorious head of the Logistics department. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
- type: entity
id: BedsheetQM
parent: BedsheetBase
name: HoL's bedsheet # DeltaV - Logistics Department replacing Cargo
name: LO's bedsheet # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
state: sheetqm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
- type: entity
parent: IDCardStandard
id: QuartermasterIDCard
name: head of logistics ID card # DeltaV - Logistics Department replacing Cargo
name: logistics officer ID card # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
layers:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@
whitelist:
tags:
- Write
insertOnInteract: false
insertOnInteract: false
- type: Item
sprite: Objects/Misc/clipboard.rsi
size: 10
Expand Down Expand Up @@ -661,7 +661,7 @@
state: stamp-mime

- type: entity
name: head of logistics' rubber stamp # DeltaV - Logistics Department replacing Cargo
name: logistics officer's rubber stamp # DeltaV - Logistics Department replacing Cargo
parent: RubberStampBase
id: RubberStampQm
suffix: DO NOT MAP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
- type: entity
parent: AirlockCommand
id: AirlockQuartermasterLocked
suffix: Head of Logistics, Locked # DeltaV - Logistics Department replacing Cargo
suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo
components:
- type: AccessReader
access: [["Quartermaster"]]
Expand Down Expand Up @@ -549,7 +549,7 @@
- type: entity
parent: AirlockCommandGlass
id: AirlockQuartermasterGlassLocked
suffix: Head of Logistics, Locked # DeltaV - Logistics Department replacing Cargo
suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo
components:
- type: AccessReader
access: [["Quartermaster"]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- type: entity
id: LockerQuarterMaster
parent: LockerBase
name: head of logistics' locker # DeltaV - Logistics Department replacing Cargo
name: logistics officer's locker # DeltaV - Logistics Department replacing Cargo
components:
- type: Appearance
- type: EntityStorageVisuals
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Objectives/objectiveGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
CaptainJetpackStealObjective: 0.5
HandTeleporterStealObjective: 0.5
SecretDocumentsStealObjective: 0.5
HoLLuckyBillStealObjective: 0.5 # DeltaV - HoL steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml
LOLuckyBillStealObjective: 0.5 # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml
HoPBookIanDossierStealObjective: 1 # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Objectives/traitor.yml

- type: weightedRandom
Expand Down
4 changes: 2 additions & 2 deletions Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<Box>
<GuideEntityEmbed Entity="NukeDisk" Caption="Nuke Disk"/>
</Box>
- Steal the Head of Logistics's [color=#a4885c]lucky bill[/color].
- Steal the Logistics Officer's [color=#a4885c]lucky bill[/color].
<Box>
<GuideEntityEmbed Entity="SpaceCashLuckyBill" Caption="Head of Logistics' Lucky Bill"/>
<GuideEntityEmbed Entity="SpaceCashLuckyBill" Caption="Logistics Officer's Lucky Bill"/>
</Box>
- Steal the Head of Personnel's [color=#a4885c]Ian Photobook[/color].
<Box>
Expand Down
4 changes: 2 additions & 2 deletions Resources/ServerInfo/Guidebook/Jobs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This department includes the janitor, passengers, clown, mime, musician, chef, b
It primarily functions as folks who entertain, clean, and serve the rest of the crew, with the exception of passengers who have no particular job beyond getting lost in maintenance.

## Logistics
Logistics consists of the cargo technicians, salvage technicians, and the head of logistics. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
Logistics consists of the cargo technicians, salvage technicians, and the logistics officer. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.

For the most part, this means they scrounge around the station and assorted wrecks to find materials to sell and redistribute, and purchase materials other departments request.

Expand All @@ -34,7 +34,7 @@ Engineering consists of technical assistants, station engineers, atmospheric tec
Engineering is readily equipped to go safely into space, and as such they should always attempt to repair uninhabitable parts of the station.

## Command
Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the mystagogue, and the head of logistics. As a department it is responsible for keeping the station and its departments running efficiently.
Command consists of the captain, the head of personnel, the head of security, the chief engineer, the chief medical officer, the mystagogue, and the logistics officer. As a department it is responsible for keeping the station and its departments running efficiently.

Command members should always be relatively competent in their respective departments and attempt to delegate responsibility and direct work.

Expand Down

0 comments on commit 6fcebdb

Please sign in to comment.