From 00aeae38886913f357985dcdbeb2a079ede52990 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Sun, 7 Dec 2025 04:07:32 +0100 Subject: [PATCH] Move Zookeeper and Boxer jobs to DeltaV namespace, based on upstream PR (#41741) --- .../Locale/en-US/_DV/chat/highlights.ftl | 2 ++ .../Locale/en-US/_DV/job/job-description.ftl | 3 ++ Resources/Locale/en-US/_DV/job/job-names.ftl | 6 ++++ .../en-US/_DV/preferences/loadout-groups.ftl | 3 ++ Resources/Locale/en-US/chat/highlights.ftl | 2 -- .../Locale/en-US/job/job-description.ftl | 2 -- Resources/Locale/en-US/job/job-names.ftl | 4 --- .../en-US/preferences/loadout-groups.ftl | 3 -- Resources/Migrations/migration.yml | 4 +++ .../Prototypes/Catalog/uplink_catalog.yml | 21 ++----------- .../Entities/Markers/Spawners/jobs.yml | 24 -------------- .../Objects/Misc/identification_cards.yml | 4 +-- .../Weapons/Guns/Shotguns/shotguns.yml | 2 +- .../Entities/Objects/base_contraband.yml | 9 ------ .../Loadouts/Miscellaneous/jobtrinkets.yml | 24 -------------- .../Prototypes/Loadouts/loadout_groups.yml | 30 ------------------ .../Prototypes/Loadouts/role_loadouts.yml | 24 -------------- Resources/Prototypes/Reagents/toxins.yml | 6 ++-- .../Prototypes/Roles/Jobs/departments.yml | 8 ++--- .../Prototypes/Roles/play_time_trackers.yml | 6 ---- .../Prototypes/_DV/Catalog/Uplink/job.yml | 17 ++++++++++ .../_DV/Entities/Markers/Spawners/jobs.yml | 24 ++++++++++++++ .../_DV/Entities/Objects/base_contraband.yml | 9 ++++++ .../Loadouts/Jobs/Wildcards/boxer.yml | 0 .../Loadouts/Miscellaneous/jobtrinkets.yml | 23 ++++++++++++++ .../_DV/Loadouts/loadout_groups.yml | 31 +++++++++++++++++++ .../Prototypes/_DV/Loadouts/role_loadouts.yml | 25 +++++++++++++++ .../_DV/Roles/play_time_trackers.yml | 6 ++++ 28 files changed, 165 insertions(+), 157 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml rename Resources/Prototypes/{ => _DV}/Loadouts/Jobs/Wildcards/boxer.yml (100%) create mode 100644 Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml diff --git a/Resources/Locale/en-US/_DV/chat/highlights.ftl b/Resources/Locale/en-US/_DV/chat/highlights.ftl index ad4646f4f7e..4a1fece1349 100644 --- a/Resources/Locale/en-US/_DV/chat/highlights.ftl +++ b/Resources/Locale/en-US/_DV/chat/highlights.ftl @@ -14,6 +14,8 @@ highlights-corpsman = Corpsman, "Corps", Brigmed, "Sec", Security, "Med", Medica highlights-gladiator = Gladiator highlights-martial-artist = Martial Artist, Martial highlight-prisoner = Prisoner +highlights-zookeeper = Zookeeper +highlights-boxer = Boxer # Epistemics highlight-roboticist = Roboticist, Epistemics, "Epi" diff --git a/Resources/Locale/en-US/_DV/job/job-description.ftl b/Resources/Locale/en-US/_DV/job/job-description.ftl index 0f2311f5582..89ce0bc5a97 100644 --- a/Resources/Locale/en-US/_DV/job/job-description.ftl +++ b/Resources/Locale/en-US/_DV/job/job-description.ftl @@ -19,3 +19,6 @@ role-description-ifrit = "Burn baby, burn!" role-description-carpy = "Grrr!" role-description-shiva = "Hsssss!" role-description-pun-pun = "Ook!" + +job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog. +job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis. diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl index 756fbf7cce5..90793fee549 100644 --- a/Resources/Locale/en-US/_DV/job/job-names.ftl +++ b/Resources/Locale/en-US/_DV/job/job-names.ftl @@ -78,6 +78,8 @@ JobProsecutor = Prosecutor JobSecurityBorg = Security Cyborg JobRoboticist = Roboticist JobCargoAssistant = Cargo Assistant +JobZookeeper = Zookeeper +JobBoxer = Boxer # Pet Roles RoleLaika = Laika @@ -93,3 +95,7 @@ role-name-ifrit = Ifrit role-name-carpy = Carpy role-name-shiva = Shiva role-name-pun-pun = Pun Pun + +# Station specific +job-name-boxer = Boxer +job-name-zookeeper = Zookeeper diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index 9e0635ccc5f..986e40eb097 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -167,5 +167,8 @@ loadout-group-martial-artist-shoes = Martial Artist shoes loadout-group-gladiator-jumpsuit = Gladiator jumpsuit loadout-group-gladiator-outerclothing = Gladiator outer clothing +loadout-group-boxer-jumpsuit = Boxer jumpsuit +loadout-group-boxer-gloves = Boxer gloves + # Species loadout-group-humanoid-silicon = Silicon-friendly survival box diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl index 4a921ef6458..469a5b565a2 100644 --- a/Resources/Locale/en-US/chat/highlights.ftl +++ b/Resources/Locale/en-US/chat/highlights.ftl @@ -46,9 +46,7 @@ highlights-passenger = Passenger, Greytider, "Tider" highlights-service-worker = Service Worker # Station-specific -highlights-boxer = Boxer highlights-reporter = Reporter, Journalist -highlights-zookeeper = Zookeeper highlights-psychologist = Psychologist, Psychology, "Psych" # Silicon diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index ca6b4d9d4f2..69295b3ddf3 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -3,7 +3,6 @@ job-description-atmostech = Optimize the station's atmospherics setup, and synth job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories. job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained. job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the epistemics team for upgrades. -job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog. job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you. job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help. job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will. @@ -46,4 +45,3 @@ job-description-serviceworker = Learn the basics of bartending, cooking, and gro job-description-station-ai = Follow your laws, serve the crew. job-description-visitor = Enjoy your visit to the station. job-description-warden = Patrol the Security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up. -job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index dcb3e607a1c..7d4d0c96680 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -50,8 +50,6 @@ job-name-ertengineer = ERT Engineer job-name-ertsecurity = ERT Security job-name-ertmedic = ERT Medic job-name-ertjanitor = ERT Janitor -job-name-boxer = Boxer -job-name-zookeeper = Zookeeper job-name-visitor = Visitor job-name-cluwne = Cluwne @@ -77,7 +75,6 @@ JobAtmosphericTechnician = Atmospheric Technician JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist -JobBoxer = Boxer JobCaptain = Captain JobCargoTechnician = Cargo Technician JobCentralCommandOfficial = Central Command Official @@ -121,4 +118,3 @@ JobStationEngineer = Station Engineer JobTechnicalAssistant = Technical Assistant JobVisitor = Visitor JobWarden = Warden -JobZookeeper = Zookeeper diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 99c8e510953..fa080b0225f 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -208,6 +208,3 @@ loadout-group-medical-glasses = Medical glasses loadout-group-reporter-jumpsuit = Reporter jumpsuit loadout-group-psychologist-jumpsuit = Psychologist jumpsuit - -loadout-group-boxer-jumpsuit = Boxer jumpsuit -loadout-group-boxer-gloves = Boxer gloves diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index a7804f0be7c..aa4ad72904a 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -692,3 +692,7 @@ ToySkeleton: ToyFigurineSkeleton # 2025-10-28 DrinkKiraSpecial: DrinkOrangeLimeSodaGlass + +# 2025-12-06 # DeltaV - We keep Zookeeper/Boxer +#SpawnPointZookeeper: null +#SpawnPointBoxer: null diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 6542fc7800f..a13dc87a02f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2055,23 +2055,6 @@ whitelist: - Passenger -- type: listing - id: uplinkRiggedBoxingGlovesBoxer - name: uplink-rigged-boxing-gloves-name - description: uplink-rigged-boxing-gloves-desc - productEntity: ClothingHandsGlovesBoxingRigged - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 2 - cost: - Telecrystal: 4 - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - Boxer - - type: listing id: uplinkNecronomicon name: uplink-necronomicon-name @@ -2254,9 +2237,9 @@ categories: - UplinkJob conditions: - - !type:BuyerJobCondition # We can't use BuyerDepartmentCondition here since Zookeeper and Chef can also get this + - !type:BuyerJobCondition # We can't use BuyerDepartmentCondition here since Chef can also get this whitelist: - - Zookeeper + - Zookeeper # DeltaV - Keep Zookeeper/Boxer - Scientist - ResearchDirector - Chef diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 2deffd32baa..222697de539 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -281,18 +281,6 @@ - state: green - state: musician -- type: entity - id: SpawnPointBoxer - parent: SpawnPointJobBase - name: boxer - components: - - type: SpawnPoint - job_id: Boxer - - type: Sprite - layers: - - state: green - - state: boxer - - type: entity id: SpawnPointBorg parent: SpawnPointJobBase @@ -611,15 +599,3 @@ layers: - state: green - state: psychologist - -- type: entity - id: SpawnPointZookeeper - parent: SpawnPointJobBase - name: zookeeper - components: - - type: SpawnPoint - job_id: Zookeeper - - type: Sprite - layers: - - state: green - - state: zookeeper diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 67b00210d5a..23f33c081e6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -800,7 +800,7 @@ offset: *icon-offset state: Boxer - type: PresetIdCard - job: Boxer + job: Boxer # DeltaV - Keep Zookeeper/Boxer - type: entity parent: IDCardStandard @@ -818,7 +818,7 @@ offset: *icon-offset state: Zookeeper - type: PresetIdCard - job: Zookeeper + job: Zookeeper # DeltaV - Keep Zookeeper/Boxer #Supply diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 1a2dca980e8..cd059a2e884 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -104,7 +104,7 @@ - type: entity name: double-barreled shotgun - parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderZookeeperContraband] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSecurityBartenderZookeeperContraband] # DeltaV - Keep Zookeeper/Boxer id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 497869de1cc..050d874774e 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -192,15 +192,6 @@ allowedDepartments: [ Security ] allowedJobs: [ Bartender ] -- type: entity - id: BaseSecurityBartenderZookeeperContraband - parent: BaseRestrictedContraband - abstract: true - components: - - type: Contraband - allowedDepartments: [ Security ] - allowedJobs: [ Bartender, Zookeeper ] - - type: entity id: BaseSecurityLawyerContraband parent: BaseRestrictedContraband diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml index c32b230deb4..2ef944c1504 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml @@ -464,27 +464,3 @@ storage: back: - PlushieLizardJobPsychologist - -- type: loadout - id: LizardPlushieBoxer - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobBoxer - time: 72000 # 20hr - storage: - back: - - PlushieLizardJobBoxer - -- type: loadout - id: LizardPlushieZookeeper - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobZookeeper - time: 72000 # 20hr - storage: - back: - - PlushieLizardJobZookeeper diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 4877a60d4ff..f016f141355 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1973,36 +1973,6 @@ loadouts: - LizardPlushiePsychologist -- type: loadoutGroup - id: BoxerJumpsuit - name: loadout-group-boxer-jumpsuit - loadouts: - - BoxerShorts - - BoxerShortsWithTop - -- type: loadoutGroup - id: BoxerGloves - name: loadout-group-boxer-gloves - loadouts: - - RedBoxingGloves - - BlueBoxingGloves - - GreenBoxingGloves - - YellowBoxingGloves - -- type: loadoutGroup - id: BoxerJobTrinkets - name: loadout-group-jobtrinkets - minLimit: 0 - loadouts: - - LizardPlushieBoxer - -- type: loadoutGroup - id: ZookeeperJobTrinkets - name: loadout-group-jobtrinkets - minLimit: 0 - loadouts: - - LizardPlushieZookeeper - # Other - type: loadoutGroup id: SurvivalSyndicate diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 21283201c51..23978bf814e 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -572,17 +572,6 @@ - GroupSpeciesBreathToolMedical # Wildcards -- type: roleLoadout - id: JobZookeeper - groups: - - GroupTankHarness - - CommonBackpack - - Glasses - - Survival - - Trinkets - - ZookeeperJobTrinkets - - GroupSpeciesBreathTool - - type: roleLoadout id: JobReporter groups: @@ -615,19 +604,6 @@ - PsychologistJobTrinkets - GroupSpeciesBreathTool -- type: roleLoadout - id: JobBoxer - groups: - - GroupTankHarness - - BoxerJumpsuit - - BoxerGloves - - CommonBackpack - - Glasses - - Survival - - Trinkets - - BoxerJobTrinkets - - GroupSpeciesBreathTool - # These loadouts are used for non-crew spawns, like off-station antags and event mobs # They will be used without player configuration, thus they will only ever apply what is forced by MinLimit diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index cff77b3b037..77a27a2cf32 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -59,7 +59,7 @@ allowedDepartments: - Medical allowedJobs: - - Zookeeper + - Zookeeper # DeltaV - Keep Zookeeper/Boxer metabolisms: Poison: metabolismRate: 0.25 # DeltaV: chloral hydrate should last longer for surgery @@ -447,7 +447,7 @@ type: [Animal] - !type:ReagentCondition # DeltaV - No longer causes vomitting at the lightest whiff of coffee reagent: Histamine - min: 0.5 + min: 0.5 - type: reagent id: Amatoxin @@ -581,7 +581,7 @@ - Security - Medical allowedJobs: - - Zookeeper + - Zookeeper # DeltaV - Keep Zookeeper/Boxer color: "#AAAAAA" metabolisms: Poison: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index fbc33bbfc5c..8594b96052c 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -19,7 +19,7 @@ roles: - Bartender - Botanist - - Boxer + - Boxer # DeltaV - Keep Zookeeper/Boxer # - Chaplain # DeltaV - Move Chaplain into Epistemics - Chef - Clown @@ -32,7 +32,7 @@ - Passenger - Reporter - Visitor - - Zookeeper + - Zookeeper # DeltaV - Keep Zookeeper/Boxer - ServiceWorker - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - Prisoner # Nyanotrasen - Prisoner, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -158,9 +158,9 @@ color: "#9FED58" weight: 10 roles: - - Boxer + - Boxer # DeltaV - Keep Zookeeper/Boxer - Reporter - - Zookeeper + - Zookeeper # DeltaV - Keep Zookeeper/Boxer - 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 diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 26647e79ae0..1bc37757ce3 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -147,9 +147,3 @@ - type: playTimeTracker id: JobWarden - -- type: playTimeTracker - id: JobBoxer - -- type: playTimeTracker - id: JobZookeeper diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/job.yml b/Resources/Prototypes/_DV/Catalog/Uplink/job.yml index 15660e94379..440c4ac682e 100644 --- a/Resources/Prototypes/_DV/Catalog/Uplink/job.yml +++ b/Resources/Prototypes/_DV/Catalog/Uplink/job.yml @@ -14,3 +14,20 @@ - !type:BuyerDepartmentCondition whitelist: - Logistics + +- type: listing + id: uplinkRiggedBoxingGlovesBoxer + name: uplink-rigged-boxing-gloves-name + description: uplink-rigged-boxing-gloves-desc + productEntity: ClothingHandsGlovesBoxingRigged + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 2 + cost: + Telecrystal: 4 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Boxer diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml index ab8045d4ee0..c137b476b6a 100644 --- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml @@ -118,3 +118,27 @@ - state: green - sprite: _DV/Markers/jobs.rsi state: surgeon + +- type: entity + id: SpawnPointBoxer + parent: SpawnPointJobBase + name: boxer + components: + - type: SpawnPoint + job_id: Boxer + - type: Sprite + layers: + - state: green + - state: boxer + +- type: entity + id: SpawnPointZookeeper + parent: SpawnPointJobBase + name: zookeeper + components: + - type: SpawnPoint + job_id: Zookeeper + - type: Sprite + layers: + - state: green + - state: zookeeper diff --git a/Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml new file mode 100644 index 00000000000..395bb2500f9 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/base_contraband.yml @@ -0,0 +1,9 @@ +# contraband restricted by job by some degree +- type: entity + id: BaseSecurityBartenderZookeeperContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security ] + allowedJobs: [ Bartender, Zookeeper ] diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml similarity index 100% rename from Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml rename to Resources/Prototypes/_DV/Loadouts/Jobs/Wildcards/boxer.yml diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml new file mode 100644 index 00000000000..8b98ba84467 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/jobtrinkets.yml @@ -0,0 +1,23 @@ +- type: loadout + id: LizardPlushieBoxer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBoxer + time: 72000 # 20hr + storage: + back: + - PlushieLizardJobBoxer + +- type: loadout + id: LizardPlushieZookeeper + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobZookeeper + time: 72000 # 20hr + storage: + back: + - PlushieLizardJobZookeeper diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 87a3ef09e35..595cf237b91 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -1023,3 +1023,34 @@ groups: - GroupEVATankERT - SurvivalExtended + +# Wildcards +- type: loadoutGroup + id: BoxerJumpsuit + name: loadout-group-boxer-jumpsuit + loadouts: + - BoxerShorts + - BoxerShortsWithTop + +- type: loadoutGroup + id: BoxerGloves + name: loadout-group-boxer-gloves + loadouts: + - RedBoxingGloves + - BlueBoxingGloves + - GreenBoxingGloves + - YellowBoxingGloves + +- type: loadoutGroup + id: BoxerJobTrinkets + name: loadout-group-jobtrinkets + minLimit: 0 + loadouts: + - LizardPlushieBoxer + +- type: loadoutGroup + id: ZookeeperJobTrinkets + name: loadout-group-jobtrinkets + minLimit: 0 + loadouts: + - LizardPlushieZookeeper diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 0ed993c7d65..5991b62ebcc 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -126,3 +126,28 @@ - Survival - Trinkets - GroupSpeciesBreathTool + +# Wildcards +- type: roleLoadout + id: JobZookeeper + groups: + - GroupTankHarness + - CommonBackpack + - Glasses + - Survival + - Trinkets + - ZookeeperJobTrinkets + - GroupSpeciesBreathTool + +- type: roleLoadout + id: JobBoxer + groups: + - GroupTankHarness + - BoxerJumpsuit + - BoxerGloves + - CommonBackpack + - Glasses + - Survival + - Trinkets + - BoxerJobTrinkets + - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml index 24c2909749e..11e7efc34dd 100644 --- a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml @@ -48,3 +48,9 @@ - type: playTimeTracker id: JobCentralCommandIntern + +- type: playTimeTracker + id: JobBoxer + +- type: playTimeTracker + id: JobZookeeper