diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index e4711a5876..2e46aa459a 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -14,7 +14,7 @@ namespace Content.Server.Salvage; public sealed partial class SalvageSystem { [ValidatePrototypeId] - private const string MagnetChannel = "Supply"; + private const string MagnetChannel = "Engineering"; // ParkStation-EngineeringSalvage - Why is this hardcoded? private EntityQuery _salvMobQuery; diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl index 3b9bc86e6f..a2e0ecb761 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl +++ b/Resources/Locale/en-US/nyanotrasen/job/job-description.ftl @@ -1,6 +1,6 @@ job-description-gladiator = Put on a combat spectacle for the crew. Fight for your freedom, glory, and honor. Currently available on Arena. 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-mail-carrier = Deliver mail and other packages to and from Cargo. Avoid dogs. job-description-martialartist = Be honorable and disciplined, spar in the dojo, challenge security to CQC. Currently available on Shōkō. job-description-prisoner = Sit in prison. Gamble with your cellmates. Talk to the warden. Write your memoirs. job-description-mantis = Solve mysteries from the nature of the universe to the meaning of life. Be the main person to deal with Psionic beings. diff --git a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl index bc99a777f1..3ade7056a4 100644 --- a/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl +++ b/Resources/Locale/en-US/nyanotrasen/job/job-names.ftl @@ -1,6 +1,6 @@ job-name-gladiator = Gladiator job-name-guard = Prison Guard -job-name-mail-carrier = Courier +job-name-mail-carrier = Mail Carrier job-name-martialartist = Martial Artist job-name-prisoner = Prisoner job-name-mantis = Psionic Mantis diff --git a/Resources/Locale/en-US/simplestation14/Prototypes/job/job-supervisors.ftl b/Resources/Locale/en-US/simplestation14/Prototypes/job/job-supervisors.ftl index 626e29013e..612718cd3a 100644 --- a/Resources/Locale/en-US/simplestation14/Prototypes/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/simplestation14/Prototypes/job/job-supervisors.ftl @@ -1 +1,2 @@ job-supervisors-css = the chief service supervisor +job-supervisors-cc = central command, and discussion among the board of heads diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 9dac47b6f1..c4cd57c85f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -5,7 +5,7 @@ state: catwalk_preview product: CargoPallet cost: 250 - category: Logistics # DeltaV - Logistics Department replacing Cargo + category: Cargo group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: orebox product: OreBox cost: 500 - category: Logistics # DeltaV - Logistics Department replacing Cargo + category: Cargo group: market - type: cargoProduct @@ -25,5 +25,5 @@ state: icon product: CrateCargoLuxuryHardsuit cost: 15000 - category: Logistics # DeltaV - Logistics Department replacing Cargo + category: Cargo group: market diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index f7648fb09c..2d450b9ec6 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -295,7 +295,7 @@ - EncryptionKey - type: entity - name: logistics encryption key box # DeltaV - Logistics Department replacing Cargo + name: cargo encryption key box parent: BoxEncryptionKeyPassenger id: BoxEncryptionKeyCargo components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 966be72c49..a25b21de3e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -20,7 +20,7 @@ - id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml - id: BoxPDACargo # Delta-V - id: QuartermasterIDCard # Delta-V - - id: ClothingShoesBootsWinterLogisticsOfficer #Delta V: Add departmental winter boots + - id: ClothingShoesBootsWinterCargoOfficer #Delta V: Add departmental winter boots - type: entity id: LockerCaptainFilledHardsuit diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 1c2c092533..1573b30a4c 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -50,7 +50,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 wary that it isn't very effective." - - "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, 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, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - "As a Salvage Technician, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator." - "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." diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index b6140daae5..4435589a19 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -57,14 +57,15 @@ - type: StorageFill contents: - id: EngineerPDA - amount: 3 + amount: 2 - id: AtmosPDA + - id: SalvagePDA # Parkstation-EngineeringSalvagers - type: entity - name: logistics PDA box + name: cargo PDA box parent: BoxPDA id: BoxPDACargo - description: A box of spare PDA microcomputers for the logistics department. + description: A box of spare PDA microcomputers for the cargo department. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index 22167ae038..755b79229a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -174,7 +174,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretLogi - name: logistics beret + name: cargo beret description: For the intellectual and studious accountant. Definitely not a revolutionary symbol. components: - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml index e4e1d31f89..d62ace8cdf 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml @@ -160,8 +160,8 @@ - type: entity parent: ClothingShoesBaseWinterBoots - id: ClothingShoesBootsWinterLogisticsOfficer - name: LO's winter boots + id: ClothingShoesBootsWinterCargoOfficer + name: QM's winter boots components: - type: Sprite sprite: DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml index b7d5d99d00..f64823d9ca 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseItem id: SpaceCashLuckyBill - 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. + name: cargo technician's lucky bill + description: The first bill ever earned by a Cargo Technician from trading. A small chip is embedded in it. components: - type: Sprite sprite: DeltaV/Objects/Misc/first_bill.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index 2b0048f1a4..0e2b92d931 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseSignDirectional - id: SignDirectionalLogistics - name: logistics sign - description: A direction sign, pointing out which way the Logistics department is. + id: SignDirectionalCargo + name: cargo sign + description: A direction sign, pointing out which way the Cargo department is. components: - type: Sprite sprite: DeltaV/Structures/Wallmounts/signs.rsi diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index cf7d4f90d6..61540d49a7 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -1,6 +1,6 @@ - type: stealTargetGroup id: SpaceCashLuckyBill - name: logistics officer's lucky bill + name: quartermaster's lucky bill sprite: sprite: DeltaV/Objects/Misc/first_bill.rsi state: icon diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index d5cdd354a9..e56d606870 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -166,8 +166,8 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackCargo - name: logistics backpack # DeltaV - Logistics Department replacing Cargo - description: A robust backpack for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo + name: cargo backpack + description: A robust backpack for stealing cargo's loot. components: - type: Sprite sprite: Clothing/Back/Backpacks/cargo.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index ca16aa5d7e..d344fc148e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -142,8 +142,8 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelCargo - 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 + name: cargo duffel bag + description: A large duffel bag for stealing cargo's precious loot. components: - type: Sprite sprite: Clothing/Back/Duffels/cargo.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index bf52477340..10d54ac25c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -144,8 +144,8 @@ - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelCargo - name: logistics satchel # DeltaV - Logistics Department replacing Cargo - description: A robust satchel for stealing logistics's loot. # DeltaV - Logistics Department replacing Cargo + name: cargo satchel + description: A robust satchel for stealing cargo's loot. components: - type: Sprite sprite: Clothing/Back/Satchels/cargo.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index df160f8e5a..3a2bcbed03 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -38,7 +38,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCargo - name: logistics headset # DeltaV - Logistics Department replacing Cargo + name: cargo headset description: A headset used by supply employees. components: - type: ContainerFill @@ -65,8 +65,8 @@ - type: entity parent: ClothingHeadsetCargo id: ClothingHeadsetQM - name: logistics officer's headset # DeltaV - Logistics Department replacing Cargo - description: A headset used by the logistics officer. # DeltaV - Logistics Department replacing Cargo + name: quartermaster's headset + description: A headset used by the Quartermaster. components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 5dfa1df150..206ee0512e 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -13,7 +13,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCargo - name: logistics officer's over-ear headset # DeltaV - Logistics Department replacing Cargo + name: cargo technician's over-ear headset components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index fe895e490b..99297ac088 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -239,7 +239,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo noSpawn: true - name: logistics winter coat hood # DeltaV - Logistics Department replacing Cargo + name: cargo winter coat hood components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi @@ -394,7 +394,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM noSpawn: true - name: logistics officer's coat hood # DeltaV - Logistics Department replacing Cargo + name: quartermaster's coat hood components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index ea5e1c0391..fa96b2b9ac 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -23,8 +23,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCargosoft - name: logistics cap # DeltaV - Logistics Department replacing Cargo - description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo + name: cargo cap + description: "It's a baseball hat painted in Cargo colors." components: - type: Sprite sprite: Clothing/Head/Soft/cargosoft.rsi @@ -39,8 +39,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatCargosoftFlipped - 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 + name: cargo cap flipped + description: "It's a baseball hat painted in Cargo colors. Flipped." components: - type: Sprite sprite: Clothing/Head/Soft/cargosoft_flipped.rsi @@ -50,8 +50,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoft - name: logistics officer's cap # DeltaV - Logistics Department replacing Cargo - description: "It's a baseball hat painted in the Logistics Officer's colors." + name: quartermaster's cap + description: "It's a baseball hat painted in the Quartermaster's colors." components: - type: Sprite sprite: Clothing/Head/Soft/qmsoft.rsi @@ -61,8 +61,8 @@ - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatQMsoftFlipped - 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." + name: quartermaster's cap flipped + description: "It's a baseball hat painted in the Quartermaster's colors. Flipped." components: - type: Sprite sprite: Clothing/Head/Soft/qmsoft_flipped.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index f31b38c20c..2e99f7a411 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -67,7 +67,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakQm - name: logistics officer's cloak # DeltaV - Logistics Department replacing Cargo + name: quartermaster's cloak description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 7b4ab07891..49d824cd26 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -57,7 +57,7 @@ parent: ClothingNeckBase id: ClothingNeckMantleRD name: mystagogue's mantle # DeltaV - Epistemics Department replacing Science - 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 + 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. components: - type: Sprite sprite: Clothing/Neck/mantles/rdmantle.rsi @@ -67,7 +67,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckMantleQM - name: logistics officer's mantle # DeltaV - Logistics Department replacing Cargo + name: quartermaster's mantle description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority! components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 51b1fb5693..b582186005 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -26,8 +26,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCargomedal - name: logistics medal # DeltaV - Logistics Department replacing Cargo - description: Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the logistics department. # DeltaV - Logistics Department replacing Cargo. Updated description for flavour + name: cargo medal + description: Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the cargo department. components: - type: Sprite sprite: DeltaV/Clothing/Neck/Medals/cargomedal.rsi # DeltaV - resprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 3deecf089b..1878769b3d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -446,7 +446,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 Logistics Officer's 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 Cargo Technician's colors. Graphene lining provides less protection, but is much easier to move. components: - type: Sprite sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 4f0a0d0aaf..90ddd3848f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -95,7 +95,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterCargo - name: logistics winter coat # DeltaV - Logistics Department replacing Cargo + name: cargo winter coat components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi @@ -345,7 +345,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterQM - name: logistics officer's winter coat # DeltaV - Logistics Department replacing Cargo + name: quartermaster's winter coat components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 241fc45352..421963c079 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -105,7 +105,7 @@ - type: entity parent: ClothingShoesBaseWinterBoots id: ClothingShoesBootsWinterCargo - name: logistics winter boots #Delta V: Rename Logistics + name: cargo winter boots components: - type: Sprite sprite: Clothing/Shoes/Boots/winterbootscargo.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 9a8c1c2a5c..ad050cea57 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -24,7 +24,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCargo name: cargo tech jumpskirt - description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo + description: A sturdy jumpskirt, issued to members of the Cargo department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi @@ -285,7 +285,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQM - name: logistics officer's jumpskirt # DeltaV - Logistics Department replacing Cargo + name: quartermaster's jumpskirt description: 'What can brown do for you?' components: - type: Sprite @@ -296,7 +296,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQMTurtleneck - name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo + name: quartermaster's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 46827f8b60..1dc1d27a4a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -72,7 +72,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit - description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo + description: A sturdy jumpsuit, issued to members of the Cargo department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi @@ -474,7 +474,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQM - name: logistics officer's jumpsuit # DeltaV - Logistics Department replacing Cargo + name: quartermaster's jumpsuit description: 'What can brown do for you?' components: - type: Sprite @@ -485,7 +485,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMTurtleneck - name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo + name: quartermaster's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. components: - type: Sprite @@ -1447,4 +1447,4 @@ - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi \ No newline at end of file + sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml index 3d337b3976..079ed687a9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/corpses.yml @@ -38,7 +38,7 @@ - MobRandomEngineerCorpse - type: entity - name: Random Logistics Corpse Spawner # DeltaV - Logistics Department replacing Cargo + name: Random Cargo Corpse Spawner id: RandomCargoCorpseSpawner parent: SalvageHumanCorpseSpawner components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 20a42d721f..54af6a7bcb 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -36,12 +36,12 @@ - type: SpawnPoint spawn_type: LateJoin -# Logistics +# Cargo - type: entity id: SpawnPointQuartermaster parent: SpawnPointJobBase - name: logistics officer # DeltaV - Logistics Department replacing Cargo + name: quartermaster components: - type: SpawnPoint job_id: Quartermaster diff --git a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml index 89ab3376c6..7ec0d31755 100644 --- a/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml +++ b/Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml @@ -31,7 +31,7 @@ - type: entity parent: SalvageHumanCorpse id: MobRandomCargoCorpse - suffix: Dead, Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Dead, Cargo components: - type: Loadout prototypes: diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 80089ab4b1..8fbff32285 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -72,7 +72,7 @@ - Common - Science - type: AccessReader - access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]] + access: [["Engineering"], ["Salvage"], ["Command"], ["Research"]] # Parkstation-EngineeringSalvagers - type: Inventory templateId: borgTall diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index dfc679cd91..0a2b4f80bb 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 logistics leg amputations are due to space tick bites. # DeltaV - Logistics Department replacing Cargo + 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. components: - type: InputMover - type: MobMover diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml index a2419101c6..25ac56a6da 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml @@ -97,7 +97,7 @@ - type: entity parent: DoorRemoteDefault id: DoorRemoteCargo - name: logistics door remote # DeltaV - Logistics Department replacing Cargo + name: cargo door remote components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 1c8a14dc76..793eec880d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -29,7 +29,7 @@ - type: entity parent: EncryptionKey id: EncryptionKeyCargo - name: logistics encryption key # DeltaV - Logistics Department replacing Cargo + name: cargo encryption key description: An encryption key used by supply employees. components: - type: EncryptionKey diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b10f779fef..be9f44f4a2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -334,10 +334,10 @@ state: pda-chaplain - type: entity - name: logistics officer PDA # DeltaV - Logistics Department replacing Cargo + name: quartermaster PDA parent: BasePDA id: QuartermasterPDA - description: PDA for the guy that directs logistics. # DeltaV - Logistics Department replacing Cargo + description: PDA for the guy that directs Cargo. components: - type: Pda id: QuartermasterIDCard @@ -351,8 +351,8 @@ - type: entity parent: BasePDA id: CargoPDA - name: logistics PDA # DeltaV - Logistics Department replacing Cargo - description: PDA for the guys that order the pizzas. # DeltaV - Logistics Department replacing Cargo + name: cargo PDA + description: PDA for the guys that order the pizzas. components: - type: Pda id: CargoIDCard diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index dd702cb024..a119fb2246 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -168,8 +168,8 @@ - type: entity parent: BaseFigurine id: ToyFigurineQuartermaster - 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 + name: quartermaster figure + description: A figurine depicting the glorious leader of Cargo. // Parkstation-CargoService components: - type: Sprite state: qm diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index f4892c0279..085aea6e91 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -248,7 +248,7 @@ - type: entity id: BedsheetQM parent: BedsheetBase - name: LO's bedsheet # DeltaV - Logistics Department replacing Cargo + name: QM's bedsheet components: - type: Sprite state: sheetqm diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 4c9427ea87..a2865f0b37 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -195,7 +195,7 @@ - type: entity parent: IDCardStandard id: CargoIDCard - name: logistics ID card # DeltaV - Logistics Department replacing Cargo + name: cargo ID card components: - type: Sprite layers: @@ -219,7 +219,7 @@ - type: entity parent: IDCardStandard id: QuartermasterIDCard - name: logistics officer ID card # DeltaV - Logistics Department replacing Cargo + name: quartermaster ID card components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index cbd960acc7..9bb1983e95 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -159,7 +159,7 @@ state: stamp-mime - type: entity - name: logistics officer's rubber stamp # DeltaV - Logistics Department replacing Cargo + name: quartermaster's rubber stamp parent: RubberStampBase id: RubberStampQm suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml index 6b24c96e30..997c3771d5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml @@ -2,7 +2,7 @@ parent: BaseItem id: WhiteCane name: white cane - description: This isn't for you. It's for the people who can't figure out you're blind when you ask if logistics is the bar. # DeltaV - Logistics Department replacing Cargo + description: This isn't for you. It's for the people who can't figure out you're blind when you ask if cargo is the bar. components: - type: Sprite sprite: Objects/Weapons/Melee/white_cane.rsi diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index be286c6309..806330fdef 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -40,8 +40,8 @@ - type: entity id: BannerCargo parent: BannerBase - name: logistics banner - description: A banner displaying the colors of the logistics department. Not. Cargonia. # DeltaV - Logistics Department replacing Cargo + name: cargo banner + description: A banner displaying the colors of cargo. // Parkstation-CargoService components: - type: Sprite sprite: Structures/Decoration/banner.rsi diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index f0cb0b80a2..66107e60f7 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -82,7 +82,7 @@ - type: entity parent: AirlockExternal id: AirlockExternalCargoLocked - suffix: External, Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: External, Cargo, Locked components: - type: AccessReader access: [["Cargo"]] @@ -162,7 +162,7 @@ - type: entity parent: AirlockCargo id: AirlockCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: AccessReader access: [["Cargo"]] @@ -302,7 +302,7 @@ - type: entity parent: AirlockCommand id: AirlockQuartermasterLocked - suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo Technician, Locked components: - type: AccessReader access: [["Quartermaster"]] @@ -484,7 +484,7 @@ - type: entity parent: AirlockExternalGlass id: AirlockExternalGlassCargoLocked - suffix: External, Glass, Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: External, Glass, Cargo, Locked components: - type: AccessReader access: [["Cargo"]] @@ -564,7 +564,7 @@ - type: entity parent: AirlockCargoGlass id: AirlockCargoGlassLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: AccessReader access: [["Cargo"]] @@ -702,7 +702,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockQuartermasterGlassLocked - suffix: Logistics Officer, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo Technician, Locked components: - type: AccessReader access: [["Quartermaster"]] @@ -874,7 +874,7 @@ - type: entity parent: AirlockMaint id: AirlockMaintCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: AccessReader access: [["Cargo"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 3a2659f829..380da00270 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -27,12 +27,12 @@ - type: entity parent: Airlock id: AirlockCargo - suffix: Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/cargo.rsi - type: PaintableAirlock - department: Logistics + department: Cargo - type: entity parent: Airlock @@ -209,12 +209,12 @@ - type: entity parent: AirlockGlass id: AirlockCargoGlass - suffix: Logistics # DeltaV - Logistics Department replacing Cargo + suffix: Cargo components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/cargo.rsi - type: PaintableAirlock - department: Logistics + department: Cargo - type: entity parent: AirlockGlass diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 5d20da09e0..e1569555ee 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -32,7 +32,7 @@ - type: entity parent: Windoor id: WindoorCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: AccessReader access: [["Cargo"]] @@ -115,7 +115,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureCargoLocked - suffix: Logistics, Locked # DeltaV - Logistics Department replacing Cargo + suffix: Cargo, Locked components: - type: AccessReader access: [["Cargo"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index dfb37f4986..14c3dbab5d 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -65,7 +65,7 @@ departments: atmospherics: Engineering basic: Civilian - cargo: Logistics + # cargo: Cargo command: Command engineering: Engineering freezer: Civilian diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml index 2bf3ce082d..c29856bccb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml @@ -37,7 +37,7 @@ - type: IntrinsicRadioReceiver - type: ActiveRadio channels: - - Supply + - Engineering # Parkstation-EngineeringSalvagers - type: SalvageMagnet - type: ApcPowerReceiver powerLoad: 2500 # TODO change this to a HV power draw that really hits the grid hard WHEN active diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index d1c6079a5b..0bfb173c80 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1510,8 +1510,8 @@ - type: entity parent: VendingMachine id: VendingMachineCargoDrobe - name: LogiDrobe # DeltaV - Logistics Department replacing Cargo - description: A highly advanced vending machine for buying logistics related clothing for free. # DeltaV - Logistics Department replacing Cargo + name: CargoDrobe + description: A highly advanced vending machine for buying cargo related clothing for free. components: - type: VendingMachine pack: CargoDrobeInventory diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index dbbd9b16ae..fe8a262b3d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -22,7 +22,7 @@ - type: entity id: LockerQuarterMaster parent: LockerBaseSecure - name: logistics officer's locker # DeltaV - Logistics Department replacing Cargo + name: quartermaster's locker components: - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml index 71635d43ad..9e5849949f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wardrobe.yml @@ -180,7 +180,7 @@ - type: entity id: WardrobeCargo parent: WardrobePrison - name: logistics wardrobe # DeltaV - Logistics Department replacing Cargo + name: cargo wardrobe - type: entity id: WardrobeSalvage diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index b847ed2b75..cb5a4b45ab 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -328,8 +328,8 @@ - type: entity parent: BaseSign id: SignCargo - name: logistics sign # DeltaV - Logistics Department replacing Cargo - description: A sign indicating the logistics area. # DeltaV - Logistics Department replacing Cargo + name: cargo sign + description: A sign indicating the cargo area. components: - type: Sprite state: cargo diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml index f7086081c5..d2acd9160d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml @@ -114,7 +114,7 @@ parent: PosterBase id: PosterLegitPizzaHope name: "Pizza Hope" - description: "In the darkest of times there is only one hope, PIZZA! Harass your local Logistics Officer to order an emergency crate of pizza now!" # DeltaV - Logistics Department replacing Cargo + description: "In the darkest of times there is only one hope, PIZZA! Harass your local Cargo Technician to order an emergency crate of pizza now!" components: - type: Sprite sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index e48d44ccff..01bcb885cc 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -10,6 +10,7 @@ - Cargo - Maintenance - Mail + - Service # Parkstation-CargoService - type: startingGear id: MailCarrierGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 84d6edee22..d07ef6d0d2 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -3,7 +3,6 @@ name: job-name-mantis description: job-description-mantis playTimeTracker: JobForensicMantis - setPreference: false # Parkstation-Playtime requirements: - !type:OverallPlaytimeRequirement time: 18000 @@ -39,7 +38,7 @@ gloves: ClothingHandsGlovesColorWhite outerClothing: ClothingOuterCoatMantis belt: ClothingBeltMantis - # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective + pocket2: ForensicScanner innerClothingSkirt: ClothingUniformSkirtMantis satchel: ClothingBackpackSatchelMantisFilled duffelbag: ClothingBackpackDuffelMantisFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 1c9fe29876..202853d3ea 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -14,7 +14,7 @@ canBeAntag: false icon: "JobIconPrisonGuard" supervisors: job-supervisors-warden - setPreference: true + setPreference: false # Parkstation- # whitelistRequired: true access: - Security diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index e350a2d813..017b6617e1 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -22,7 +22,7 @@ CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 SecretDocumentsStealObjective: 0.5 - LOLuckyBillStealObjective: 0.5 # DeltaV - LO 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 HoSGunStealObjective: 0.5 diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index 7eb2290ede..e5b863dcc5 100644 --- a/Resources/Prototypes/Palettes/departmental.yml +++ b/Resources/Prototypes/Palettes/departmental.yml @@ -9,6 +9,6 @@ security: "#DE3A3A96" bar: "#79150096" epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science - logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo + cargo: "#A4610696" neutral: "#D4D4D496" neutralLight: "#D4D4D428" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index f79a30e5fd..9d2af82ff9 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -6,12 +6,12 @@ antagAdvantage: 2 # DeltaV - Reduced TC: External Access startingGear: CargoTechGear icon: "JobIconCargoTechnician" - supervisors: job-supervisors-qm + supervisors: job-supervisors-css access: - Cargo - Maintenance - extendedAccess: - - Salvage + # extendedAccess: # Parkstation-CargoService + # - Salvage # Parkstation-CargoService - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index d9375d75ae..f5a24eaeb4 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -4,6 +4,7 @@ description: job-description-qm playTimeTracker: JobQuartermaster antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff + setPreference: false # Parkstation-CargoService requirements: # - !type:RoleTimeRequirement #DeltaV # role: JobCargoTechnician @@ -14,9 +15,9 @@ - !type:RoleTimeRequirement # DeltaV - Courier role time requirement role: JobMailCarrier time: 7200 # 2 hours - - !type:DepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 43200 #DeltaV 12 hours + # - !type:DepartmentTimeRequirement # Parkstation-CargoService + # department: Cargo + # time: 43200 #DeltaV 12 hours - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index f2f7c01641..45949cadde 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,15 +6,15 @@ antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons requirements: - !type:DepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo + department: Engineering # ParkStation-EngineeringSalvagers time: 21600 #DeltaV 6 hrs # - !type:OverallPlaytimeRequirement #DeltaV # time: 36000 #10 hrs icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear - supervisors: job-supervisors-qm + supervisors: job-supervisors-ce # Parkstation-EngineeringSalvagers access: - - Cargo + - Engineering # ParkStation-EngineeringSalvagers - Salvage - Maintenance - External @@ -26,6 +26,6 @@ back: ClothingBackpackSalvageFilled shoes: ClothingShoesBootsSalvage id: SalvagePDA - ears: ClothingHeadsetCargo + ears: ClothingHeadsetEngineering # Parkstation-EngineeringSalvagers satchel: ClothingBackpackSatchelSalvageFilled duffelbag: ClothingBackpackDuffelSalvageFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 905121dbf8..dac83c54ae 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -4,9 +4,9 @@ description: job-description-captain playTimeTracker: JobCaptain requirements: - - !type:DepartmentTimeRequirement - department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 18000 # DeltaV - 5 hours + #- !type:DepartmentTimeRequirement # Parkstation-CargoService + # department: Cargo + # time: 18000 # DeltaV - 5 hours - !type:DepartmentTimeRequirement department: Engineering time: 18000 # DeltaV - 5 hours diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 211d50f375..ede7d26ffd 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,7 +5,6 @@ playTimeTracker: JobHeadOfPersonnel antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - # Parkstation-Playtime - !type:DepartmentTimeRequirement department: Engineering time: 3600 # 1 hour @@ -21,7 +20,7 @@ startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Command @@ -50,13 +49,15 @@ # - Cargo # - Atmospherics # - Medical - - Boxer # DeltaV - Add Boxer access - - Clown # DeltaV - Add Clown access - - Library # DeltaV - Add Library access - - Mime # DeltaV - Add Mime access - - Musician # DeltaV - Add Musician access - - Reporter # DeltaV - Add Reporter access - - Zookeeper # DeltaV - Add Zookeeper access + # Parkstation-Oligarchy Start + # - Boxer # DeltaV - Add Boxer access + # - Clown # DeltaV - Add Clown access + # - Library # DeltaV - Add Library access + # - Mime # DeltaV - Add Mime access + # - Musician # DeltaV - Add Musician access + # - Reporter # DeltaV - Add Reporter access + # - Zookeeper # DeltaV - Add Zookeeper access + # Parkstation-Oligarchy End special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 658f09d5a1..5ecf03c51b 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -20,7 +20,7 @@ startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 6de15a14ce..13cb65cfd0 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -17,7 +17,7 @@ startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Medical diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 83826c4374..182c8b5dd8 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -15,7 +15,7 @@ startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - Research diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index c5cb79110a..535def5b0b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -18,7 +18,7 @@ startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true - supervisors: job-supervisors-captain + supervisors: job-supervisors-cc # ParkStation-Oligarchy canBeAntag: false access: - HeadOfSecurity diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8971c7f9fa..684210b2ac 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,12 +1,14 @@ -- type: department - id: Logistics # DeltaV - Logistics Department replacing Cargo - description: department-Cargo-description - color: "#A46106" - roles: - - CargoTechnician - - Quartermaster - - SalvageSpecialist - - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml +# Parkstation-CargoService Start +# - type: department +# id: Cargo +# description: department-Cargo-description +# color: "#A46106" +# roles: +# - CargoTechnician +# - Quartermaster +# - SalvageSpecialist +# - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml +# Parkstation-CargoService End - type: department id: Civilian @@ -21,8 +23,10 @@ # - Chaplain # DeltaV - Move Chaplain into Epistemics - Chef - Clown - - HeadOfPersonnel + # - HeadOfPersonnel # Parkstation-CSS - ChiefServiceSupervisor # Parkstation-CSS + - CargoTechnician # Parkstation-CargoService + - MailCarrier # Parkstation-CargoService - Janitor - Lawyer - Librarian @@ -42,7 +46,7 @@ description: department-Command-description color: "#334E6D" roles: - - Captain + # - Captain # Parkstation-Oligarchy - CentralCommandOfficial - ChiefServiceSupervisor # Parkstation-CSS - ChiefEngineer @@ -50,7 +54,7 @@ - HeadOfPersonnel - HeadOfSecurity - ResearchDirector - - Quartermaster + # - Quartermaster # Parkstation-CargoService primary: false weight: 100 @@ -64,6 +68,7 @@ - SeniorEngineer - StationEngineer - TechnicalAssistant + - SalvageSpecialist # Parkstation-EngineeringSalvagers - type: department id: Medical @@ -106,18 +111,20 @@ - Chaplain # DeltaV - Move Chaplain into Epistemics - ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml -- type: department - id: Specific - description: department-Specific-description - color: "#9FED58" - weight: 10 - roles: - - Boxer - - Reporter - - Zookeeper - - Psychologist - - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml - - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml - primary: false +# Parkstation-Oligarchy Start +#- type: department +# id: Specific +# description: department-Specific-description +# color: "#9FED58" +# weight: 10 +# roles: +# - Boxer +# - Reporter +# - Zookeeper +# - Psychologist +# - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml +# - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +# - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +# - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +# primary: false +# Parkstation-Oligarchy End diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png index 1b0acdd241..48e9214ae2 100644 Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png index 7645fe9aad..c90568a350 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png differ