From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Sun, 7 Dec 2025 03:07:32 +0000 (+0100) Subject: Remove Zookeeper and Boxer jobs (#41741) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=58f884133bcd3978411556bc55b7ece3bda71e3f;p=space-station-14.git Remove Zookeeper and Boxer jobs (#41741) --- diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/chat/highlights.ftl index 6d3610e7f0..0a1c2d948d 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 # Silicon diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 414f59fb18..b7c6228e12 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 science 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 Convex. 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 a4b80d8b3f..f7d3167dca 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -46,8 +46,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 @@ -73,7 +71,6 @@ JobAtmosphericTechnician = Atmospheric Technician JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist -JobBoxer = Boxer JobCaptain = Captain JobCargoTechnician = Cargo Technician JobCentralCommandOfficial = Central Command Official @@ -117,4 +114,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 b014cd180a..7a1adcc65b 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -207,6 +207,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/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 3ecd49c4b4..9925596c48 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -2012,23 +2012,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 @@ -2210,9 +2193,8 @@ 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 - Scientist - ResearchDirector - Chef diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 3a43116798..108c65c3cc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -280,18 +280,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 @@ -606,15 +594,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 2ecf7be55d..29edda603f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -784,8 +784,6 @@ - sprite: *icon-rsi offset: *icon-offset state: Boxer - - type: PresetIdCard - job: Boxer - type: entity parent: IDCardStandard @@ -802,8 +800,6 @@ - sprite: *icon-rsi offset: *icon-offset state: Zookeeper - - type: PresetIdCard - job: Zookeeper #Supply diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 0a23a51a4f..27dc095c73 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, BaseSecurityBartenderContraband] 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 fc7bb857f1..8db8e12cd4 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -189,15 +189,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/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml deleted file mode 100644 index a9833798c7..0000000000 --- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Jumpsuit -- type: loadout - id: BoxerShorts - equipment: - jumpsuit: UniformShortsRed - -- type: loadout - id: BoxerShortsWithTop - equipment: - jumpsuit: UniformShortsRedWithTop - -# Gloves -- type: loadout - id: RedBoxingGloves - equipment: - gloves: ClothingHandsGlovesBoxingRed - -- type: loadout - id: BlueBoxingGloves - equipment: - gloves: ClothingHandsGlovesBoxingBlue - -- type: loadout - id: GreenBoxingGloves - equipment: - gloves: ClothingHandsGlovesBoxingGreen - -- type: loadout - id: YellowBoxingGloves - equipment: - gloves: ClothingHandsGlovesBoxingYellow diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/jobtrinkets.yml index 0cfc932c77..9da2b02f2b 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 b1b1a3a294..33b4ba1fcc 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1600,36 +1600,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 d0ab791a30..25999b6686 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -514,17 +514,6 @@ - GroupSpeciesBreathToolMedical # Wildcards -- type: roleLoadout - id: JobZookeeper - groups: - - GroupTankHarness - - CommonBackpack - - Glasses - - Survival - - Trinkets - - ZookeeperJobTrinkets - - GroupSpeciesBreathTool - - type: roleLoadout id: JobReporter groups: @@ -549,19 +538,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/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index ea7618d586..af45486bfc 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -32,7 +32,6 @@ Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] ServiceWorker: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Reporter: [ 1, 1 ] #engineering (8) AtmosphericTechnician: [ 3, 3 ] diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index baf39989b8..9ddbc4aef2 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -58,8 +58,6 @@ physicalDesc: reagent-physical-desc-nondescript allowedDepartments: - Medical - allowedJobs: - - Zookeeper metabolisms: Poison: effects: @@ -555,8 +553,6 @@ allowedDepartments: - Security - Medical - allowedJobs: - - Zookeeper color: "#AAAAAA" metabolisms: Poison: diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml deleted file mode 100644 index bcf7d065c4..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ /dev/null @@ -1,37 +0,0 @@ -- type: job - id: Boxer - name: job-name-boxer - description: job-description-boxer - playTimeTracker: JobBoxer - startingGear: BoxerGear - icon: "JobIconBoxer" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - special: - - !type:GiveItemOnHolidaySpecial - holiday: BoxingDay - prototype: ClothingHandsGlovesBoxingRigged - -- type: startingGear - id: BoxerGear - equipment: - id: BoxerPDA - ears: ClothingHeadsetService - shoes: ClothingShoesColorRed - belt: ClothingBeltChampion - #storage: - #back: - #- Stuff - -- type: chameleonOutfit - id: BoxerChameleonOutfit - job: Boxer - equipment: - head: ClothingHeadHatBlacksoft - eyes: ClothingEyesGlassesCheapSunglasses - mask: ClothingMaskBreath - outerClothing: ClothingOuterWinterColorGray - jumpsuit: UniformShortsRedWithTop - neck: ClothingNeckScarfStripedRed diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml deleted file mode 100644 index 643e372a2f..0000000000 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: job - id: Zookeeper - name: job-name-zookeeper - description: job-description-zookeeper - playTimeTracker: JobZookeeper - startingGear: ZookeeperGear - icon: "JobIconZookeeper" - supervisors: job-supervisors-hop - access: - - Service - - Maintenance - special: - - !type:GiveItemOnHolidaySpecial - holiday: MonkeyDay - prototype: MonkeyCubeBox - -- type: startingGear - id: ZookeeperGear - equipment: - jumpsuit: ClothingUniformJumpsuitSafari - head: ClothingHeadSafari - shoes: ClothingShoesColorWhite - id: ZookeeperPDA - ears: ClothingHeadsetService - #storage: - #back: - #- Stuff - -- type: chameleonOutfit - id: ZookeeperChameleonOutfit - job: Zookeeper - equipment: - eyes: ClothingEyesGlassesCheapSunglasses - mask: ClothingMaskBreath - outerClothing: ClothingOuterWinterColorLightBrown - neck: ClothingNeckScarfStripedBrown - belt: ClothingBeltStorageWaistbag - gloves: ClothingHandsGlovesColorBrown - diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 15737a273b..6294657ab3 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -17,7 +17,6 @@ roles: - Bartender - Botanist - - Boxer - Chaplain - Chef - Clown @@ -30,7 +29,6 @@ - Passenger - Reporter - Visitor - - Zookeeper - ServiceWorker - type: department @@ -139,8 +137,6 @@ color: "#9FED58" weight: 10 roles: - - Boxer - Reporter - - Zookeeper - Psychologist primary: false diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 26647e79ae..1bc37757ce 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/migration.yml b/Resources/migration.yml index 3cf660fdf4..3ab01ff75c 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -738,3 +738,7 @@ ToySkeleton: ToyFigurineSkeleton # 2025-10-28 DrinkKiraSpecial: DrinkOrangeLimeSodaGlass + +# 2025-12-06 +SpawnPointZookeeper: null +SpawnPointBoxer: null