Cloak

Resources/Changelog/Mira.yml

@@ -321,3 +321,9 @@ Entries:
     type: Add
   id: 50
   time: '2024-08-09T18:04:00.0000000+00:00'
+- author: Doctor-Cpu
+  changes:
+  - message: Added senior cargo loadouts
+    type: Add
+  id: 51
+  time: '2024-08-09T18:47:00.0000000+00:00'

Resources/Locale/en-US/job/job-names.ftl

@@ -50,6 +50,7 @@ job-name-senior-engineer = Senior Engineer
 job-name-senior-researcher = Senior Researcher
 job-name-senior-physician = Senior Physician
 job-name-senior-officer = Senior Officer
+job-name-senior-cargo = Senior Cargo
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician

Resources/Locale/en-US/preferences/loadout-groups.ftl

@@ -94,9 +94,11 @@ loadout-group-cargo-technician-jumpsuit = Cargo Technician jumpsuit
 loadout-group-cargo-technician-backpack = Cargo Technician backpack
 loadout-group-cargo-technician-outerclothing = Cargo Technician outer clothing
 loadout-group-cargo-technician-shoes = Cargo Technician shoes
+loadout-group-cargo-technician-id = Cargo Technician ID
 
 loadout-group-salvage-specialist-backpack = Salvage Specialist backpack
 loadout-group-salvage-specialist-outerclothing = Salvage Specialist outer clothing
+loadout-group-salvage-specialist-neck = Salvage Specialist neck
 loadout-group-salvage-specialist-shoes = Salvage Specialist shoes
 
 # Engineering

Resources/Prototypes/Entities/Clothing/Head/soft.yml

@@ -18,7 +18,7 @@
     - state: icon_flipped
       map: ["foldedLayer"]
       visible: false
-      
+
 - type: entity
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHeadHatBaseFlipped
@@ -83,6 +83,33 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
+  id: ClothingHeadHatSeniorCargo
+  name: senior cargo cap
+  description: "It's a baseball hat painted in the Senior Cargo's colours."
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Soft/senior_cargo.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Soft/senior_cargo.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
+
+- type: entity
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft]
+  id: ClothingHeadHatSeniorCargoFlipped
+  name: senior cargo cap
+  components:
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatQMsoft
@@ -98,7 +125,7 @@
   parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft]
   id: ClothingHeadHatQMsoftFlipped
   name: quartermaster's cap
-    
+
 - type: entity
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCorpsoft
@@ -285,7 +312,7 @@
   parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft]
   id: ClothingHeadHatBizarreSoftFlipped
   name: troublemaker's cap
-    
+
 - type: entity
   parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatParamedicsoft

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -646,6 +646,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtSeniorCargo
+  name: senior cargo jumpskirt
+  description: A sign of skill and prestige within the cargo department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/senior_cargo.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/senior_cargo.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtSecGrey

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -1157,6 +1157,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/senior_officer.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSeniorCargo
+  name: senior cargo jumpsuit
+  description: A sign of skill and prestige within the cargo department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/senior_cargo.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/senior_cargo.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitWeb

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -1028,6 +1028,22 @@
   - type: Icon
     state: pda-seniorofficer
 
+- type: entity
+  parent: BasePDA
+  id: SeniorCargoPDA
+  name: senior cargo PDA
+  description: Covered in dirt and welding fuel.
+  components:
+  - type: Pda
+    id: SeniorCargoIDCard
+    state: pda-seniorcargo
+  - type: PdaBorderColor
+    borderColor: "#e39751"
+    accentHColor: "#8900c9"
+    accentVColor: "#a23e3e"
+  - type: Icon
+    state: pda-seniorcargo
+
 - type: entity
   parent: SyndiPDA
   id: PiratePDA

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -617,7 +617,7 @@
     - JobIconDetective
     - JobIconLawyer
 
-    - JobIconPassenger
+    - JobIconNanotrasen
     - JobIconCaptain
     - JobIconHeadOfPersonnel
 
@@ -630,7 +630,7 @@
     - JobIconParamedic
     - JobIconPsychologist
 
-    - JobIconClown
+    - JobIconPassenger
     - JobIconBotanist
     - JobIconBartender
 
@@ -643,7 +643,7 @@
 
     - JobIconLibrarian
     - JobIconChaplain
-    - JobIconMime
+    - JobIconClown
     - JobIconChef
     - JobIconZookeeper
 
@@ -653,20 +653,20 @@
     - JobIconScientist
     - JobIconResearchAssistant
 
+    - JobIconJanitor
+    - JobIconBoxer
+    - JobIconMusician
+    - JobIconMime
+    - JobIconReporter
+    - JobIconServiceWorker
+
     # Cargo
     - JobIconQuarterMaster
+    - JobIconSeniorCargo
     - JobIconCargoTechnician
     - JobIconShaftMiner
 
-    - JobIconJanitor
-    - JobIconReporter
-    - JobIconServiceWorker
-
-    - JobIconNanotrasen
     - JobIconVisitor
-    - JobIconBoxer
-    - JobIconMusician
-
 
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
@@ -875,6 +875,19 @@
     jobName: job-name-senior-officer
     jobIcon: JobIconSeniorOfficer
 
+- type: entity
+  parent: CargoIDCard
+  id: SeniorCargoIDCard
+  name: senior cargo ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idseniorcargo
+  - type: PresetIdCard
+    jobName: job-name-senior-cargo
+    jobIcon: JobIconSeniorCargo
+
 - type: entity
   parent: IDCardStandard
   id: UniversalIDCard

Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml

@@ -1,9 +1,34 @@
+# Senior Time
+- type: loadoutEffectGroup
+  id: SeniorCargo
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobCargoTechnician
+      time: 0
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 0
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Cargo
+      time: 0
+
 # Head
 - type: loadout
   id: CargoTechnicianHead
   equipment:
     head: ClothingHeadHatCargosoft
 
+- type: loadout
+  id: SeniorCargoHead
+  equipment:
+    head: ClothingHeadHatSeniorCargo
+
 # Jumpsuit
 - type: loadout
   id: CargoTechnicianJumpsuit
@@ -15,6 +40,22 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtCargo
 
+- type: loadout
+  id: SeniorCargoJumpsuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorCargo
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSeniorCargo
+
+- type: loadout
+  id: SeniorCargoJumpskirt
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorCargo
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtSeniorCargo
+
 # Back
 - type: loadout
   id: CargoTechnicianBackpack
@@ -42,3 +83,17 @@
   id: CargoWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterCargo
+
+# ID
+- type: loadout
+  id: CargoTechnicianPDA
+  equipment:
+    id: CargoPDA
+
+- type: loadout
+  id: SeniorCargoPDA
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorCargo
+  equipment:
+    id: SeniorCargoPDA

Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

@@ -1,3 +1,18 @@
+# Senior times
+- type: loadoutEffectGroup
+  id: SeniorSalvage
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobSalvageSpecialist
+      time: 18000
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Cargo
+      time: 25200
+
 # Back
 - type: loadout
   id: SalvageSpecialistBackpack
@@ -14,6 +29,15 @@
   equipment:
     back: ClothingBackpackDuffelSalvage
 
+# Neck
+- type: loadout
+  id: SalvageSpecialistCloak
+  equipment:
+    neck: ClothingNeckCloakMiner
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: SeniorSalvage
+
 # OuterClothing
 - type: loadout
   id: SalvageSpecialistWintercoat

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -561,13 +561,16 @@
   minLimit: 0
   loadouts:
   - CargoTechnicianHead
+  - SeniorCargoHead
 
 - type: loadoutGroup
   id: CargoTechnicianJumpsuit
   name: loadout-group-cargo-technician-jumpsuit
   loadouts:
   - CargoTechnicianJumpsuit
   - CargoTechnicianJumpskirt
+  - SeniorCargoJumpsuit
+  - SeniorCargoJumpskirt
 
 - type: loadoutGroup
   id: CargoTechnicianBackpack
@@ -591,6 +594,13 @@
   - BlackShoes
   - CargoWinterBoots
 
+- type: loadoutGroup
+  id: CargoTechnicianPDA
+  name: loadout-group-cargo-technician-id
+  loadouts:
+  - CargoTechnicianPDA
+  - SeniorCargoPDA
+
 - type: loadoutGroup
   id: SalvageSpecialistBackpack
   name: loadout-group-salvage-specialist-backpack
@@ -599,6 +609,13 @@
   - SalvageSpecialistSatchel
   - SalvageSpecialistDuffel
 
+- type: loadoutGroup
+  id: SalvageSpecialistNeck
+  name: loadout-group-salvage-specialist-neck
+  minLimit: 0
+  loadouts:
+  - SalvageSpecialistCloak
+
 - type: loadoutGroup
   id: SalvageSpecialistOuterClothing
   name: loadout-group-salvage-specialist-outerclothing

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -209,6 +209,7 @@
   - CargoTechnicianBackpack
   - CargoTechnicianOuterClothing
   - CargoTechnicianShoes
+  - CargoTechnicianPDA
   - Glasses
   - Survival
   - Trinkets
@@ -220,6 +221,7 @@
   - GroupTankHarness
   - SalvageSpecialistBackpack
   - SalvageSpecialistOuterClothing
+  - SalvageSpecialistNeck
   - SalvageSpecialistShoes
   - Glasses
   - Survival