From 9db50c9ee262f273c0f1516fea866d57af6aa622 Mon Sep 17 00:00:00 2001 From: War Pigeon <54217755+minus1over12@users.noreply.github.com> Date: Tue, 11 Feb 2025 05:47:19 -0600 Subject: [PATCH] Add additional holiday gear to jobs (#34207) * Jobs react to more holidays * Replace taser with Weh auto-injector * Give cargo techs a box on box(ing) day --- .../Objects/Specific/Medical/hypospray.yml | 30 +++++++++++++++++++ .../Roles/Jobs/Cargo/cargo_technician.yml | 4 +++ .../Roles/Jobs/Civilian/botanist.yml | 4 +++ .../Engineering/atmospheric_technician.yml | 4 +++ .../Roles/Jobs/Medical/medical_doctor.yml | 4 +++ .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 4 +++ .../Roles/Jobs/Wildcards/zookeeper.yml | 4 +++ 7 files changed, 54 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 067d40bbff..c002f9c671 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -546,3 +546,33 @@ - id: Hypopen sound: path: /Audio/Effects/unwrap.ogg + +- type: entity + name: weh auto-injector + parent: ChemicalMedipen + id: WehMedipen + description: A rapid dose of Weh. Contains juice that makes you Weh. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: medipen + map: [ "enum.SolutionContainerLayers.Fill" ] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: medipen_empty + - type: SolutionContainerManager + solutions: + pen: + maxVol: 60 + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 60 + - type: Hypospray + solutionName: pen + transferAmount: 1 + onlyAffectsMobs: false + injectOnly: true + - type: Tag + tags: [] diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 655e103bca..cd71ab05b5 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -11,6 +11,10 @@ - Maintenance extendedAccess: - Salvage + special: + - !type:GiveItemOnHolidaySpecial + holiday: BoxingDay + prototype: BoxCardboard - type: startingGear id: CargoTechGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index dd25a2abe2..47c1ccca02 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -13,6 +13,10 @@ extendedAccess: - Kitchen - Bar + special: + - !type:GiveItemOnHolidaySpecial + holiday: FourTwenty + prototype: CannabisSeeds - type: startingGear id: BotanistGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 9810b48571..55c5cfaa06 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -15,6 +15,10 @@ - Engineering - External - Atmospherics + special: + - !type:GiveItemOnHolidaySpecial + holiday: FirefighterDay + prototype: FireAxe - type: startingGear id: AtmosphericTechnicianGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 11a8d10188..c23401f0fb 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -15,6 +15,10 @@ - Maintenance extendedAccess: - Chemistry + special: + - !type:GiveItemOnHolidaySpecial + holiday: DoctorDay + prototype: WehMedipen - type: startingGear id: DoctorGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index e2f8de9609..8eb28c273e 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -9,6 +9,10 @@ access: - Service - Maintenance + special: + - !type:GiveItemOnHolidaySpecial + holiday: BoxingDay + prototype: ClothingHandsGlovesBoxingRigged - type: startingGear id: BoxerGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 32c98ed487..879a5a3af4 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -9,6 +9,10 @@ access: - Service - Maintenance + special: + - !type:GiveItemOnHolidaySpecial + holiday: MonkeyDay + prototype: MonkeyCubeBox - type: startingGear id: ZookeeperGear -- 2.51.2