Skip to content

Commit

Permalink
Merge branch 'master' into wgw
Browse files Browse the repository at this point in the history
  • Loading branch information
Colin-Tel authored Sep 21, 2023
2 parents 19cf85e + e555206 commit 7c5fb0f
Show file tree
Hide file tree
Showing 129 changed files with 2,069 additions and 119 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,11 @@ Entries:
crewmates more effectively.
id: 11
time: '2023-09-21T04:01:02.0000000+00:00'
- author: FluffiestFloof
changes:
- type: Add
message: Added the Courier, the Mail Carrier's cousin.
- type: Tweak
message: Cargo Department is now the Logistics Department
id: 12
time: '2023-09-21T04:37:30.0000000+00:00'
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/guidebook/guides.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ guide-entry-teg = Thermo-electric Generator (TEG)
guide-entry-controls = Controls
guide-entry-radio = Radio
guide-entry-jobs = Jobs
guide-entry-cargo = Cargo
guide-entry-cargo = Logistics
guide-entry-cargo-bounties = Cargo Bounties
guide-entry-salvage = Salvage
guide-entry-survival = Survival
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/job/department.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
department-Cargo = Cargo
department-Cargo = Logistics
department-Civilian = Civilian
department-Command = Command
department-Engineering = Engineering
Expand Down
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 = Quartermaster
job-name-qm = Head of Logistics
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 = Quartermaster
JobQuartermaster = Head of Logistics
JobReporter = Reporter
JobResearchAssistant = Research Assistant
JobResearchDirector = Research Director
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 research director
job-supervisors-qm = the quartermaster
job-supervisors-qm = the head of logistics
job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
advertisement-maildrobe-1 = Outrun any dog with our psuedo-suede duracarbon mail shorts! Limited supply!
advertisement-maildrobe-2 = Blue looks good on you!
1 change: 1 addition & 0 deletions Resources/Locale/en-US/nyanotrasen/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor.
job-description-guard = Keep track of prisoners and make sure they have their basic needs.
job-description-mail-carrier = Deliver mail and other packages from and to logistics. Avoid dogs.
job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC.
job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs.
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/nyanotrasen/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
job-name-gladiator = Gladiator
job-name-guard = Prison Guard
job-name-mail-carrier = Courier
job-name-martialartist = Martial Artist
job-name-prisoner = Prisoner
# Role timers
JobMailCarrier = Courier
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 = Quartermaster
stamp-component-stamped-name-qm = Head of Logistics
stamp-component-stamped-name-rd = Research Director
stamp-component-stamped-name-warden = Warden
stamp-component-stamped-name-trader = Trader
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ id-card-access-level-medical = Medical
id-card-access-level-chemistry = Chemistry
id-card-access-level-paramedic = Paramedic
id-card-access-level-quartermaster = Quartermaster
id-card-access-level-cargo = Cargo
id-card-access-level-quartermaster = Head of Logistics
id-card-access-level-cargo = Logistics
id-card-access-level-salvage = Salvage
id-card-access-level-bar = Bar
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 Quartermasters could call their own. Centcomm has heard you, now stop asking.
.desc = Finally, a hardsuit the Head of Logistics could call their own. Centcomm has heard you, now stop asking.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ent-CrateFunBoardGames = Board game crate
.desc = Game nights have been proven to either decrease boredom or increase murderous rage depending on the game.
ent-CrateFunATV = ATV crate
.desc = An Absolutely Taxable Vehicle to help cargo with hauling.
.desc = An Absolutely Taxable Vehicle to help logistics with hauling.
ent-CrateFunSadTromboneImplants = Sad Trombone Implants
.desc = Death's never been so fun before! Implant these to make dying a bit more happy.
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/station-events/events/cargo-gifts.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cargo-gifts-event-announcement = Congratulations! { $sender } has decided to send { $description } to the station { $dest }. Look for it in your next cargo shipment.
cargo-gift-default-description = A bundle of gifts
cargo-gift-default-sender = NanoTrasen
cargo-gift-default-dest = Cargo Dept.
cargo-gift-default-dest = Logistics Dept.
cargo-gift-dest-bar = bar
cargo-gift-dest-eng = Engineering Dept
cargo-gift-dest-supp = Cargo Dept
cargo-gift-dest-supp = Logistics Dept
cargo-gift-dest-janitor = Service Dept
cargo-gift-dest-med = Medical Dept
cargo-gift-dest-sec = Security Dept
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Access/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
- Quartermaster
- Salvage
- Cargo
- Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
1 change: 1 addition & 0 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@
- Chapel
- Hydroponics
- Atmospherics
- Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
- EncryptionKey

- type: entity
name: cargo encryption key box
name: logistics encryption key box # DeltaV - Logistics Department replacing Cargo
parent: BoxEncryptionKeyPassenger
id: BoxEncryptionKeyCargo
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Datasets/tips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
- "You can examine your headset to see which radio channels you have available and how to speak in them."
- "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space."
- "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be weary that it isn't very effective."
- "As a Salvage Technician, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
- "As a Salvage Technician, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
- "As a Salvage Technician, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
- "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials."
- "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner."
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@
- type: entity
parent: ClothingBackpack
id: ClothingBackpackCargo
name: cargo backpack
description: A robust backpack for stealing cargo's loot.
name: logistics backpack # DeltaV - Logistics Department replacing Cargo
description: A robust backpack for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/cargo.rsi
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelCargo
name: cargo duffel bag
description: A large duffel bag for stealing cargo's precious loot.
name: logistics duffel bag # DeltaV - Logistics Department replacing Cargo
description: A large duffel bag for stealing logistics's precious loot. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Back/Duffels/cargo.rsi
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@
- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelCargo
name: cargo satchel
description: A robust satchel for stealing cargo's loot.
name: logistics satchel # DeltaV - Logistics Department replacing Cargo
description: A robust satchel for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Back/Satchels/cargo.rsi
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 @@ -36,7 +36,7 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetCargo
name: cargo headset
name: logistics headset # DeltaV - Logistics Department replacing Cargo
description: A headset used by supply employees.
components:
- type: ContainerFill
Expand Down Expand Up @@ -64,7 +64,7 @@
parent: ClothingHeadsetCargo
id: ClothingHeadsetQM
name: qm headset
description: A headset used by the quartermaster.
description: A headset used by the head of logistics. # 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: quartermaster's over-ear headset
name: head of logistics' over-ear headset # DeltaV - Logistics Department replacing Cargo
components:
- type: ContainerFill
containers:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
parent: ClothingHeadHatHoodWinterBase
id: ClothingHeadHatHoodWinterCargo
noSpawn: true
name: cargo winter coat hood
name: logistics winter coat hood # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi
Expand Down Expand Up @@ -382,7 +382,7 @@
parent: ClothingHeadHatHoodWinterBase
id: ClothingHeadHatHoodWinterQM
noSpawn: true
name: quartermaster's coat hood
name: head of logistics' coat hood # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi
Expand Down
20 changes: 10 additions & 10 deletions Resources/Prototypes/Entities/Clothing/Head/soft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatCargosoft
name: cargo cap
description: "It's a baseball hat painted in Cargo colours."
name: logistics cap # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Head/Soft/cargosoft.rsi
Expand All @@ -38,8 +38,8 @@
- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatCargosoftFlipped
name: cargo cap flipped
description: "It's a baseball hat painted in Cargo colours. Flipped."
name: logistics cap flipped # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
Expand All @@ -49,8 +49,8 @@
- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatQMsoft
name: quartermaster's cap
description: "It's a baseball hat painted in the Quartermaster's colors."
name: head of logistics' cap # DeltaV - Logistics Department replacing Cargo
description: "It's a baseball hat painted in the Head of Logistics' colors."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft.rsi
Expand All @@ -60,14 +60,14 @@
- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatQMsoftFlipped
name: quartermaster's cap flipped
description: "It's a baseball hat painted in the Quartermaster's colors. Flipped."
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."
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/qmsoft_flipped.rsi

- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatCorpsoft
Expand Down Expand Up @@ -291,7 +291,7 @@
sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
- type: Clothing
sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi

- type: entity
parent: ClothingHeadBaseButcherable
id: ClothingHeadHatParamedicsoft
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: quartermaster's cloak
name: head of logistics' 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
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
sprite: Clothing/Neck/mantles/cemantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/cemantle.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleCMO
Expand All @@ -30,7 +30,7 @@
sprite: Clothing/Neck/mantles/cmomantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/cmomantle.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleHOP
Expand All @@ -41,7 +41,7 @@
sprite: Clothing/Neck/mantles/hopmantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/hopmantle.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleHOS
Expand All @@ -52,14 +52,14 @@
sprite: Clothing/Neck/mantles/hosmantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/hosmantle.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleRD
name: research director's mantle
description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy.
description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from logistics; this mantle will keep you comfy. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Neck/mantles/rdmantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/rdmantle.rsi
sprite: Clothing/Neck/mantles/rdmantle.rsi
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Neck/medals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCargomedal
name: cargo medal
description: Given for the best work in the cargo department.
name: logistics medal # DeltaV - Logistics Department replacing Cargo
description: Given for the best work in the logistics department. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Neck/Medals/cargomedal.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterCargo
name: cargo winter coat
name: logistics winter coat # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
Expand Down Expand Up @@ -322,7 +322,7 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterQM
name: quartermaster's winter coat
name: head of logistics' 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 @@ -24,7 +24,7 @@
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCargo
name: cargo tech jumpskirt
description: A sturdy jumpskirt, issued to members of the Cargo department.
description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
Expand Down Expand Up @@ -284,7 +284,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtQM
name: quartermaster's jumpskirt
name: head of logistics' jumpskirt # DeltaV - Logistics Department replacing Cargo
description: 'What can brown do for you?'
components:
- type: Sprite
Expand All @@ -295,7 +295,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtQMTurtleneck
name: quartermasters's turtleneck
name: head of logistics' turtleneck # DeltaV - Logistics Department replacing Cargo
description: A sharp turtleneck made for the hardy work environment of supply.
components:
- type: Sprite
Expand Down
Loading

0 comments on commit 7c5fb0f

Please sign in to comment.