From a512a77046ecc5a481a838609e22499fc90d8798 Mon Sep 17 00:00:00 2001 From: Cheackraze <71046427+Cheackraze@users.noreply.github.com> Date: Sun, 23 Oct 2022 15:42:25 -0400 Subject: [PATCH] Zookeeper (#12020) * jumpsuit sprite * hat and meta to match * pda * id card * update spawner jobs.yml * update identification_cards.yml * Update pda.yml * update jumpsuits.yml * zookeeper job yml * zookeeper icon * update hats.yml * woops fixed hats.yml * fix id cards yml * job spawner icon and json * update map yml * update departments yml * job icon meta.json * comes with the hat * real * real * localization * fix spawner jobs yml * playtime tracker * kettle spawn * Revert "kettle spawn" This reverts commit 37c241cb31a6f186f31a73f168a93649423e839a. * kettle spawn * service locked windoor * updated sprites and updated meta.json thanks to EmoGarbage * meta.json * Update Resources/Textures/Objects/Devices/pda.rsi/meta.json Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Update Resources/Textures/Objects/Misc/id_cards.rsi/meta.json Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * credit to EmoGarbage404 and alphabetized * license Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- Resources/Locale/en-US/job/job-names.ftl | 2 + Resources/Maps/kettle.yml | 575 ++++++++++-------- .../Entities/Clothing/Head/hats.yml | 11 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 + .../Entities/Markers/Spawners/jobs.yml | 12 + .../Entities/Objects/Devices/pda.yml | 15 + .../Objects/Misc/identification_cards.yml | 12 + .../Structures/Doors/Windoors/windoor.yml | 9 + Resources/Prototypes/Maps/kettle.yml | 1 + .../Roles/Jobs/Wildcards/zookeeper.yml | 23 + .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Prototypes/Roles/play_time_trackers.yml | 3 + .../Hats/safarihat.rsi/equipped-HELMET.png | Bin 0 -> 600 bytes .../Clothing/Head/Hats/safarihat.rsi/icon.png | Bin 0 -> 433 bytes .../Head/Hats/safarihat.rsi/meta.json | 18 + .../safari.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 961 bytes .../Uniforms/Jumpsuit/safari.rsi/icon.png | Bin 0 -> 440 bytes .../Jumpsuit/safari.rsi/inhand-left.png | Bin 0 -> 534 bytes .../Jumpsuit/safari.rsi/inhand-right.png | Bin 0 -> 551 bytes .../Uniforms/Jumpsuit/safari.rsi/meta.json | 26 + .../Misc/job_icons.rsi/Zookeeper.png | Bin 0 -> 1155 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 + Resources/Textures/Markers/jobs.rsi/meta.json | 3 + .../Textures/Markers/jobs.rsi/zookeeper.png | Bin 0 -> 4175 bytes .../Objects/Devices/pda.rsi/meta.json | 3 + .../Objects/Devices/pda.rsi/pda-zookeeper.png | Bin 0 -> 2224 bytes .../Objects/Misc/id_cards.rsi/idzookeeper.png | Bin 0 -> 1413 bytes .../Objects/Misc/id_cards.rsi/meta.json | 3 + 28 files changed, 461 insertions(+), 270 deletions(-) create mode 100644 Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml create mode 100644 Resources/Textures/Clothing/Head/Hats/safarihat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/safarihat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png create mode 100644 Resources/Textures/Markers/jobs.rsi/zookeeper.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 6a4262033b..0af9d8a16c 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -39,6 +39,7 @@ job-name-ertsecurity = ERT security job-name-ertmedic = ERT medic job-name-ertjanitor = ERT janitor job-name-boxer = boxer +job-name-zookeeper = zookeeper # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = atmospheric technician @@ -82,3 +83,4 @@ JobStationEngineer = station engineer JobTechnicalAssistant = technical assistant JobWarden = warden JobBoxer = boxer +JobZookeeper = zookeeper \ No newline at end of file diff --git a/Resources/Maps/kettle.yml b/Resources/Maps/kettle.yml index 8119ea1a56..69d54df18a 100644 --- a/Resources/Maps/kettle.yml +++ b/Resources/Maps/kettle.yml @@ -25235,7 +25235,7 @@ entities: -1,-38: 0 -1,-37: 0 -1,-36: 0 - -1,-35: 1 + -1,-35: 10 -1,-34: 0 -1,-33: 0 16,-32: 0 @@ -25350,7 +25350,7 @@ entities: 1,-39: 0 1,-38: 0 1,-37: 0 - 1,-36: 1 + 1,-36: 10 1,-35: 0 1,-34: 0 1,-33: 0 @@ -25381,7 +25381,7 @@ entities: 3,-38: 0 3,-37: 0 3,-36: 0 - 3,-35: 1 + 3,-35: 10 3,-34: 0 3,-33: 0 4,-47: 0 @@ -25411,7 +25411,7 @@ entities: 5,-38: 0 5,-37: 0 5,-36: 0 - 5,-35: 1 + 5,-35: 10 5,-34: 0 5,-33: 0 6,-47: 0 @@ -25471,7 +25471,7 @@ entities: 9,-38: 0 9,-37: 0 9,-36: 0 - 9,-35: 1 + 9,-35: 10 9,-34: 0 9,-33: 0 10,-47: 0 @@ -25501,7 +25501,7 @@ entities: 11,-38: 0 11,-37: 0 11,-36: 0 - 11,-35: 1 + 11,-35: 10 11,-34: 0 11,-33: 0 12,-47: 0 @@ -25561,7 +25561,7 @@ entities: 15,-38: 0 15,-37: 0 15,-36: 0 - 15,-35: 1 + 15,-35: 10 15,-34: 0 15,-33: 0 16,-47: 0 @@ -26875,7 +26875,7 @@ entities: -36,-47: 0 -36,-46: 0 -36,-45: 0 - -36,-44: 10 + -36,-44: 11 -36,-43: 1 -36,-42: 0 -36,-41: 0 @@ -30670,7 +30670,7 @@ entities: -40,47: 0 -39,32: 0 -39,38: 0 - -39,39: 11 + -39,39: 12 -39,40: 0 -39,41: 0 -39,42: 0 @@ -30852,7 +30852,7 @@ entities: -35,62: 0 -35,63: 0 -34,48: 12 - -34,49: 11 + -34,49: 13 -34,50: 0 -34,51: 0 -34,52: 0 @@ -31878,7 +31878,7 @@ entities: -49,10: 0 -49,11: 0 -49,12: 1 - -49,13: 13 + -49,13: 14 -49,14: 0 -49,15: 0 -48,0: 0 @@ -32337,7 +32337,7 @@ entities: -52,47: 0 -51,32: 0 -51,35: 0 - -51,36: 14 + -51,36: 15 -51,37: 0 -51,38: 0 -51,39: 0 @@ -32581,7 +32581,7 @@ entities: 14,75: 0 14,76: 0 14,77: 0 - 15,64: 15 + 15,64: 9 15,65: 0 15,66: 0 15,69: 0 @@ -36635,6 +36635,32 @@ entities: 72,7: 2 72,8: 2 72,9: 2 + 54,47: 2 + 48,59: 2 + 48,60: 2 + 49,56: 2 + 49,57: 2 + 49,58: 2 + 50,54: 2 + 50,55: 2 + 50,56: 2 + 51,53: 2 + 51,54: 2 + 51,55: 2 + 52,53: 2 + 52,54: 2 + 52,55: 2 + 53,50: 2 + 53,51: 2 + 53,52: 2 + 53,53: 2 + 53,54: 2 + 54,48: 2 + 54,49: 2 + 54,50: 2 + 46,63: 2 + 47,61: 2 + 47,62: 2 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -36651,6 +36677,141 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 17.389294 + - 65.41687 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 20.647041 + - 77.6722 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.54911 + - 81.065704 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.765179 + - 81.878525 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 20.715982 + - 77.93156 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -36669,143 +36830,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 0 - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 20.919859 - - 78.69852 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.624104 - - 81.34782 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.784466 - - 81.95109 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 20.970055 - - 78.887344 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 15.521976 - - 58.3922 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.213781 - - 79.80423 + - 13.855177 + - 52.121857 - 0 - 0 - 0 @@ -36834,8 +36860,23 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.102604 - - 79.38599 + - 21.213781 + - 79.80423 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 20.841213 + - 78.402664 - 0 - 0 - 0 @@ -36864,8 +36905,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 20.970053 - - 78.887344 + - 21.531403 + - 80.99909 - 0 - 0 - 0 @@ -36879,23 +36920,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.599285 - - 81.25446 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 20.922508 - - 78.70849 + - 20.650978 + - 77.68702 - 0 - 0 - 0 @@ -36917,7 +36943,7 @@ entities: - pos: 34.5,12.5 parent: 82 type: Transform - - SecondsUntilStateChange: -231505.64 + - SecondsUntilStateChange: -249329.4 state: Opening type: Door - inputs: @@ -37056,7 +37082,7 @@ entities: - pos: 34.5,14.5 parent: 82 type: Transform - - SecondsUntilStateChange: -231505.64 + - SecondsUntilStateChange: -249329.4 state: Opening type: Door - inputs: @@ -42827,7 +42853,7 @@ entities: - pos: 23.5,14.5 parent: 82 type: Transform - - SecondsUntilStateChange: -231566.89 + - SecondsUntilStateChange: -249390.66 state: Closing type: Door - inputs: @@ -42843,7 +42869,7 @@ entities: - pos: 23.5,13.5 parent: 82 type: Transform - - SecondsUntilStateChange: -231566.89 + - SecondsUntilStateChange: -249390.66 state: Closing type: Door - inputs: @@ -42859,7 +42885,7 @@ entities: - pos: 23.5,12.5 parent: 82 type: Transform - - SecondsUntilStateChange: -231566.89 + - SecondsUntilStateChange: -249390.66 state: Closing type: Door - inputs: @@ -43296,7 +43322,7 @@ entities: - pos: 34.5,13.5 parent: 82 type: Transform - - SecondsUntilStateChange: -231505.64 + - SecondsUntilStateChange: -249329.4 state: Opening type: Door - inputs: @@ -54988,7 +55014,7 @@ entities: - pos: -41.5,-42.5 parent: 82 type: Transform - - SecondsUntilStateChange: -118534.37 + - SecondsUntilStateChange: -136358.12 state: Opening type: Door - uid: 2822 @@ -54997,7 +55023,7 @@ entities: - pos: -41.5,-44.5 parent: 82 type: Transform - - SecondsUntilStateChange: -118532.15 + - SecondsUntilStateChange: -136355.9 state: Opening type: Door - uid: 2823 @@ -57858,7 +57884,7 @@ entities: - pos: 58.5,-6.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -61341,7 +61367,7 @@ entities: - pos: 53.5,-25.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61357,7 +61383,7 @@ entities: - pos: 53.5,-26.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61373,7 +61399,7 @@ entities: - pos: 53.5,-27.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61389,7 +61415,7 @@ entities: - pos: 53.5,-28.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61405,7 +61431,7 @@ entities: - pos: 53.5,-29.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61421,7 +61447,7 @@ entities: - pos: 53.5,-30.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61437,7 +61463,7 @@ entities: - pos: 56.5,-25.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61453,7 +61479,7 @@ entities: - pos: 56.5,-26.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61469,7 +61495,7 @@ entities: - pos: 56.5,-27.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61485,7 +61511,7 @@ entities: - pos: 56.5,-28.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61501,7 +61527,7 @@ entities: - pos: 56.5,-29.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -61517,7 +61543,7 @@ entities: - pos: 56.5,-30.5 parent: 82 type: Transform - - SecondsUntilStateChange: -229770.56 + - SecondsUntilStateChange: -247594.33 state: Opening type: Door - inputs: @@ -64393,7 +64419,7 @@ entities: - pos: -11.5,17.5 parent: 82 type: Transform - - SecondsUntilStateChange: -295546.16 + - SecondsUntilStateChange: -313369.94 state: Opening type: Door - uid: 4246 @@ -64402,7 +64428,7 @@ entities: - pos: -11.5,19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -295544.4 + - SecondsUntilStateChange: -313368.2 state: Opening type: Door - uid: 4247 @@ -75317,9 +75343,9 @@ entities: parent: 82 type: Transform - uid: 6008 - type: ClothingHeadHatFedoraGrey + type: ClothingHeadSafari components: - - pos: -14.51906,-29.31554 + - pos: -14.6152,-29.168224 parent: 82 type: Transform - uid: 6009 @@ -75341,14 +75367,11 @@ entities: parent: 82 type: Transform - uid: 6012 - type: SurveillanceWirelessCameraAnchoredEntertainment + type: AirlockServiceGlassLocked components: - - pos: -14.5,-34.5 + - pos: -11.5,-31.5 parent: 82 type: Transform - - setupAvailableNetworks: - - SurveillanceCameraEntertainment - type: SurveillanceCamera - uid: 6013 type: SurveillanceWirelessCameraMovableEntertainment components: @@ -77007,7 +77030,7 @@ entities: - pos: -21.5,50.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170425.53 + - SecondsUntilStateChange: -188249.3 state: Opening type: Door - inputs: @@ -77023,7 +77046,7 @@ entities: - pos: -21.5,48.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170425.53 + - SecondsUntilStateChange: -188249.3 state: Opening type: Door - inputs: @@ -77229,7 +77252,7 @@ entities: - pos: 59.5,-6.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -80202,7 +80225,7 @@ entities: - pos: -21.5,49.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170425.53 + - SecondsUntilStateChange: -188249.3 state: Opening type: Door - inputs: @@ -80225,7 +80248,7 @@ entities: - pos: -21.5,47.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170425.53 + - SecondsUntilStateChange: -188249.3 state: Opening type: Door - inputs: @@ -81222,7 +81245,7 @@ entities: pos: 3.5,-19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81239,7 +81262,7 @@ entities: pos: 2.5,-19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81303,7 +81326,7 @@ entities: - pos: 1.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81319,7 +81342,7 @@ entities: - pos: 2.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81335,7 +81358,7 @@ entities: - pos: 3.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81351,7 +81374,7 @@ entities: - pos: 5.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81367,7 +81390,7 @@ entities: - pos: 6.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81383,7 +81406,7 @@ entities: - pos: 7.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81399,7 +81422,7 @@ entities: - pos: 8.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81415,7 +81438,7 @@ entities: - pos: 9.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81431,7 +81454,7 @@ entities: - pos: 11.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81447,7 +81470,7 @@ entities: - pos: 12.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81463,7 +81486,7 @@ entities: - pos: 13.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81479,7 +81502,7 @@ entities: - pos: 14.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -81496,7 +81519,7 @@ entities: pos: 16.5,-11.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -82358,7 +82381,7 @@ entities: pos: 16.5,-10.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -82375,7 +82398,7 @@ entities: pos: -1.5,-11.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -85129,7 +85152,7 @@ entities: pos: -1.5,-10.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -86484,7 +86507,7 @@ entities: pos: 25.5,64.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -94430,7 +94453,7 @@ entities: pos: -39.5,-42.5 parent: 82 type: Transform - - SecondsUntilStateChange: -118706.4 + - SecondsUntilStateChange: -136530.16 state: Opening type: Door - uid: 8897 @@ -104584,7 +104607,7 @@ entities: - pos: 62.5,-6.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -106397,9 +106420,9 @@ entities: parent: 82 type: Transform - uid: 10704 - type: AirlockGlass + type: ClothingUniformJumpsuitSafari components: - - pos: -11.5,-31.5 + - pos: -14.379087,-29.473778 parent: 82 type: Transform - uid: 10705 @@ -117852,7 +117875,7 @@ entities: - pos: -8.5,32.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -117868,7 +117891,7 @@ entities: - pos: -9.5,32.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -117884,7 +117907,7 @@ entities: - pos: -7.5,32.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -117908,7 +117931,7 @@ entities: pos: -6.5,34.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -117925,7 +117948,7 @@ entities: pos: -6.5,35.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -130539,7 +130562,7 @@ entities: - pos: 60.5,-6.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -143806,7 +143829,7 @@ entities: pos: -39.5,-44.5 parent: 82 type: Transform - - SecondsUntilStateChange: -118531.414 + - SecondsUntilStateChange: -136355.17 state: Opening type: Door - uid: 15912 @@ -165438,7 +165461,7 @@ entities: pos: -46.5,-34.5 parent: 82 type: Transform - - SecondsUntilStateChange: -117388.16 + - SecondsUntilStateChange: -135211.92 state: Opening type: Door - inputs: @@ -179729,7 +179752,7 @@ entities: pos: 12.5,-19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -180467,7 +180490,7 @@ entities: pos: 11.5,-19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -181119,7 +181142,7 @@ entities: pos: 10.5,-19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -181136,7 +181159,7 @@ entities: pos: 4.5,-19.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -181152,7 +181175,7 @@ entities: - pos: 0.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -225638.27 + - SecondsUntilStateChange: -243462.03 state: Opening type: Door - inputs: @@ -188811,7 +188834,7 @@ entities: pos: -6.5,33.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -201967,7 +201990,7 @@ entities: - pos: -26.5,60.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170438.88 + - SecondsUntilStateChange: -188262.64 state: Closing type: Door - inputs: @@ -201983,7 +202006,7 @@ entities: - pos: -24.5,60.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170438.88 + - SecondsUntilStateChange: -188262.64 state: Closing type: Door - inputs: @@ -202020,7 +202043,7 @@ entities: - pos: -25.5,60.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170438.88 + - SecondsUntilStateChange: -188262.64 state: Closing type: Door - inputs: @@ -202199,7 +202222,7 @@ entities: - pos: -23.5,60.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170438.88 + - SecondsUntilStateChange: -188262.64 state: Closing type: Door - inputs: @@ -202791,7 +202814,7 @@ entities: - pos: -27.5,60.5 parent: 82 type: Transform - - SecondsUntilStateChange: -170438.88 + - SecondsUntilStateChange: -188262.64 state: Closing type: Door - inputs: @@ -206418,7 +206441,7 @@ entities: - pos: -10.5,32.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -206474,7 +206497,7 @@ entities: pos: 25.5,65.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -206490,7 +206513,7 @@ entities: - pos: 28.5,67.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -206506,7 +206529,7 @@ entities: - pos: 27.5,67.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -206522,7 +206545,7 @@ entities: - pos: 28.5,62.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -206538,7 +206561,7 @@ entities: - pos: 26.5,62.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -206554,7 +206577,7 @@ entities: - pos: 27.5,62.5 parent: 82 type: Transform - - SecondsUntilStateChange: -125755.12 + - SecondsUntilStateChange: -143578.88 state: Opening type: Door - inputs: @@ -206614,7 +206637,7 @@ entities: pos: -6.5,36.5 parent: 82 type: Transform - - SecondsUntilStateChange: -124447.01 + - SecondsUntilStateChange: -142270.77 state: Opening type: Door - inputs: @@ -206957,7 +206980,7 @@ entities: - pos: -41.5,-40.5 parent: 82 type: Transform - - SecondsUntilStateChange: -118533.336 + - SecondsUntilStateChange: -136357.1 state: Opening type: Door - uid: 25220 @@ -206997,7 +207020,7 @@ entities: pos: -46.5,-35.5 parent: 82 type: Transform - - SecondsUntilStateChange: -117388.16 + - SecondsUntilStateChange: -135211.92 state: Opening type: Door - inputs: @@ -207013,7 +207036,7 @@ entities: - pos: -45.5,-33.5 parent: 82 type: Transform - - SecondsUntilStateChange: -117388.16 + - SecondsUntilStateChange: -135211.92 state: Opening type: Door - inputs: @@ -207029,7 +207052,7 @@ entities: - pos: -44.5,-33.5 parent: 82 type: Transform - - SecondsUntilStateChange: -117388.16 + - SecondsUntilStateChange: -135211.92 state: Opening type: Door - inputs: @@ -207045,7 +207068,7 @@ entities: - pos: -42.5,-33.5 parent: 82 type: Transform - - SecondsUntilStateChange: -117388.16 + - SecondsUntilStateChange: -135211.92 state: Opening type: Door - inputs: @@ -207061,7 +207084,7 @@ entities: - pos: -41.5,-33.5 parent: 82 type: Transform - - SecondsUntilStateChange: -117388.16 + - SecondsUntilStateChange: -135211.92 state: Opening type: Door - inputs: @@ -207367,7 +207390,7 @@ entities: - pos: 61.5,-6.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207398,7 +207421,7 @@ entities: pos: 57.5,-7.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207415,7 +207438,7 @@ entities: pos: 57.5,-8.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207432,7 +207455,7 @@ entities: pos: 57.5,-10.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207449,7 +207472,7 @@ entities: pos: 57.5,-11.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207466,7 +207489,7 @@ entities: pos: 57.5,-9.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207483,7 +207506,7 @@ entities: pos: 59.5,-14.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -207500,7 +207523,7 @@ entities: pos: 59.5,-15.5 parent: 82 type: Transform - - SecondsUntilStateChange: -114602.87 + - SecondsUntilStateChange: -132426.62 state: Opening type: Door - inputs: @@ -209261,4 +209284,16 @@ entities: - pos: 46.473396,62.53585 parent: 82 type: Transform +- uid: 25518 + type: SpawnPointZookeeper + components: + - pos: -13.5,-29.5 + parent: 82 + type: Transform +- uid: 25519 + type: ClothingShoesBootsWork + components: + - pos: -14.698534,-29.390446 + parent: 82 + type: Transform ... diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 4d593bdcd8..dbf43cd519 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -478,3 +478,14 @@ sprite: Clothing/Head/Hats/rasta.rsi - type: Clothing sprite: Clothing/Head/Hats/rasta.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadSafari + name: safari hat + description: Keeps the sun out of your eyes. Makes you a target for the locals. + components: + - type: Sprite + sprite: Clothing/Head/Hats/safarihat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/safarihat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 0d3f3f173f..3ace39c6d2 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -812,6 +812,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/reporter.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSafari + name: safari suit + description: Perfect for a jungle excursion. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/safari.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/safari.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitJournalist diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 1243f0af34..7b38859926 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -505,3 +505,15 @@ 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/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 2f6d02826d..c8b0ed4903 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -688,6 +688,21 @@ - type: Icon state: pda-reporter +- type: entity + parent: BasePDA + id: ZookeeperPDA + name: zookeeper PDA + description: Made with genuine synthetic leather. Crikey! + components: + - type: PDA + id: ZookeeperIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-zookeeper + - type: Icon + state: pda-zookeeper + - type: entity parent: BasePDA id: BoxerPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index a10b93c346..55dbf95144 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -525,6 +525,18 @@ - type: PresetIdCard job: Boxer +- type: entity + parent: IDCardStandard + id: ZookeeperIDCard + name: zookeeper ID card + components: + - type: Sprite + layers: + - state: default + - state: idzookeeper + - type: PresetIdCard + job: Zookeeper + - type: entity parent: IDCardStandard id: DetectiveIDCard diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index a2490a8c8e..39a53969db 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -12,6 +12,7 @@ # TODO remove these with parameterized prototypes/whatever we end up doing # Windoors (alphabetical) + - type: entity parent: Windoor id: WindoorBarLocked @@ -76,6 +77,14 @@ - type: AccessReader access: [["Kitchen"], ["Hydroponics"]] +- type: entity + parent: Windoor + id: WindoorServiceLocked + suffix: Service, Locked + components: + - type: AccessReader + access: [["Service"]] + - type: entity parent: Windoor id: WindoorTheatreLocked diff --git a/Resources/Prototypes/Maps/kettle.yml b/Resources/Prototypes/Maps/kettle.yml index fad791179d..d82e92a902 100644 --- a/Resources/Prototypes/Maps/kettle.yml +++ b/Resources/Prototypes/Maps/kettle.yml @@ -44,3 +44,4 @@ ServiceWorker: [ 2, 2 ] SecurityCadet: [ 3, 4 ] Detective: [ 1, 1 ] + Zookeeper: [1, 1] diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml new file mode 100644 index 0000000000..a45a331039 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -0,0 +1,23 @@ +- type: job + id: Zookeeper + name: job-name-zookeeper + playTimeTracker: JobZookeeper + startingGear: ZookeeperGear + icon: "Zookeeper" + supervisors: job-supervisors-hop + access: + - Service + - Maintenance + +- type: startingGear + id: ZookeeperGear + equipment: + jumpsuit: ClothingUniformJumpsuitSafari + back: ClothingBackpackFilled + head: ClothingHeadSafari + shoes: ClothingShoesColorWhite + id: ZookeeperPDA + ears: ClothingHeadsetService + innerclothingskirt: ClothingUniformJumpsuitSafari + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 42fee54414..0aaa19e876 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -22,6 +22,7 @@ - Musician - Passenger - Reporter + - Zookeeper - SecurityCadet - ServiceWorker - TechnicalAssistant diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 1095ae0123..c3682037ea 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -126,3 +126,6 @@ - type: playTimeTracker id: JobBoxer + +- type: playTimeTracker + id: JobZookeeper \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d617c08590a91350033505dd42cdd585a5990e GIT binary patch literal 600 zcmV-e0;m0nP)Px%5=lfsRCt{2+PzM~P!tF7KgQLM7~()!BqVM|jSp~LTpU+?#j$KNux_ia8`Uxj#T**dvi{tivALG(_~Ha~TXlV)cKq#) zd=>!k)T-;P!?VkAn8QXsYaM?{dctrt_JbRPULV8JSTyx)B^_U!vCGpV zo!wmjvcLcKj_bR}(CgW*4`DZC6aPE0Pq?idYXDeVU5PwqI2r>0&Tk(4>&~+{1`}{w zIo4~dD<~9mk;ix1uNaQT6Y*yeWh~Ck1P49un_+qec%FxsX6?%#VG_Svy2wZ$gV+g( zdoxO@R9=Y^k|c;1!C742yj0=|_-&W~*8^~k32;3C*ZzG1h=_=Yh=~5B#6ODu1WrGS z{x(*{(YS0&Ws96`sXYRVs1qi^dIp&KJOHHGBVdHp|AXCIwj%+n`8 mL_|bHL_|bHL_|dN=Y0S%^AUf=GaBgt0000Px$Ye_^wR9J=Wl(9;~Kp4mWiY0U^gie~NC_xZug3dY!4t;^FeFOUh!6&e9kkuD( zcULsH1W__wox(xdp_C5ipcgJCm)=zch5IcD06NLeb!hn5ejg56e z`Fn478vu~Lz7^kxm)BZrY86Lez>ZE28*A=wpR^>D3su6`k=Rrf$fq;aQmtAgf$?a- zJl|Db)bm}8M+2qdRNjH#LQ8;>>_=)uq=Ouw2Xm z0C~PZZ^tga%Z74G7R)D}k__pDmTKaJ010Vs4IlRe7mWZ`CsGplderK+bGewKWwmPq zdG{ieWU!rX(NF|1QKGT~BHaG$aS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json new file mode 100644 index 0000000000..779279f128 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d0faea21a7e2b604ef034b8b86ea470995e46670 GIT binary patch literal 961 zcmV;y13vtTP)Px&dr3q=RCt{2n!igMVHn517K0QU1JNmU3V|*~u(*^C3U(=$&MqC?I;wjS>8}0( z1t~&tE*08BAsN~Z4N1us8Zt>H6)rav2_zl#IiGuTxx44hnLzt|K<;w)=KX%(C+{!c z_XQM1Q4~c{l>d_nN#etu^2+V;fFf>L0Jpa2aE*C!7I*OuzXN?1DD?q%oaaB+GDx>69R@aFp@gJ9|tgFZ|2 z@5B}7WasCQFXX@rZ@xEwFz>IcM zbAc#*{@GSPb|)BQqFSkA(Kdr2Nves70&wnj@blMiq^9ly0G_?t!>4zz0RWxLKXBYm zBBrAB9p@66%vAr?LSGbs*>nn-d(+fOWLGZc1`G0_v*z*8_3SX_%v9WtR zK|^0sol+bq*fi!36MS(E2pVIP8uz29R_e%HYtfh=^h{9{MNt$*Q4~c{6eV#Ech-A+ zuYTMN<43%K!OsHFN)T<6-{#>6(*tP&H|v5n2Q;ish?q;!{H(xj2Z0wp%uC$-#EYU_ zuw1P9&I(BLvV|9(mc>nPaS;cA;KIQ0%hM7}Ez^qx>t%6ngzplM0)7^O2g7D*-l_(e zLi~KdDBx!l26>8$C;(2|^_>}LHd>zW(#pa}*5#eH>lL0lJ@V3Qw8S1n0a$(U1i)3b zqrY)udLfT-5jTOLLXUD=EKJkp2N7+Jeg60Zj&m9K&USxZ%DLN#^dUhMfXQwb`TNrvPlf*#tOLL&M5CPx$a!Eu%R9J=Wlr2xgP!xur5eUIHRZUgX1Vi`=euMyqKY*FQqF{eu;SUTHc47ui zfads{{{&7|XTkw(Gg&+Jr$2fag238khNBepVKsuv{C@cj$FS zSguX4Gs5#7EZ3I00!o%Z-87979Vm?w!XRD>uJ+R?p;~K}^1Uuq-0O@0I6B@1&{=?a z38aVwgh8wWE8B8yy{5_{p;Ql4Yt2d;CBQt*isFrn`(@K#T7VJ(=#KyGUlLp-0AMoB z^aQ{n18Nc`(@f${CZPD>c)p{jAdQlxQWVdXp>z`t`eQz`8E?aPHa52a*gL;w`1;7~ z`wM_cHe=8qOXAC>;Iz84)aB{NGbd;J3p+~00>m$2F<9}tDx!{kxV_NzJviLfuU_%i iH}@|hp9X`$VE6%7JfHR86dd^g00000&r*+`j7}-O%8>9+>F!4B z=_cpTEUA(7{IqDz9#*Zd(-NbT@BicP%gx^Nw7cT{AFEG`I_5AkB=oCQ{QkqlAmX?FV(lJA2A}2kZ`{2ZRUId>ktyZ7 z&yMBg?|(8LU+SEGM=s&lzm4Da7$j9|zS_EHPi@y<+e?)$FtEhFlW$W*@t6Icr4zR5 z95{OOpqavD$7`S7r=H~7G%cUu!JU#Dz17dfE^cC&B%7kk&2R#wt|92ugjWjLkqn0o zL>`n(*!@>=*I&hN{pZq?t4$)Uyw_Oo;S&O?u4iLRm%bD3ZJ+r0je_t+qdLX~1=f9% TGd6t!Ml^$`tDnm{r-UW|2N3I= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..375191764237027aeb9df3082801a0e2b22e6d4f GIT binary patch literal 551 zcmV+?0@(eDP)Px$;Ymb6RCt{2**{OhKo|z_r$#qjDig9um>if`+;DObM-x^yjFKKESQh?4eX`_};&1-n@W3 zb5P!G*`n?R%v8d;cF)C$?1AlZSYF>2C{-JVH5mWdPu{UL7{}t<2cqYdo&olYz16d? z^9ulwJHJKy`3?Xun|)({ZzpQz zm0LD%U;)wxChXI-^ZJC-!ts3E>|yr)v9jQ+vTWYKz471A=KB66R%Za9UtS_2A|fIp zA|fIk=+-e-5!f8{(ye2xN~r)>7e~8*ejQ^KN`DvY)-hg$@)np5CxH*{p3{v|0d(sa zFGBejpj*dSl~MtO5Qc6YV^vB8FbqQg^A2pg+ef?G$KlDPGqy(4^`=~-!0xb&ZXIJ4 p%KKIbVLX-#KSA^Cz!H&;egQxIJC0*WuXF$a002ovPDHLkV1lRF`C0$~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json new file mode 100644 index 0000000000..fc9c0ae2d0 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png new file mode 100644 index 0000000000000000000000000000000000000000..bc84017e3af54770265bbafe8d8d868c0cc6088e GIT binary patch literal 1155 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 Z{|0NE)2)_VO4tAZ002ovPDHLkV1iA04$%Mr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index ee383c3248..4d580a650e 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -163,6 +163,9 @@ { "name": "pda-interntech" }, + { + "name": "pda-zookeeper" + }, { "name": "pda-ert" } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png new file mode 100644 index 0000000000000000000000000000000000000000..2923bfff3718f9de5f37f8732e3752b6716dafe9 GIT binary patch literal 2224 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 TQsCXY00000NkvXXu0mjf6>6L( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index b5bb20f02d..66e1d52beb 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -148,6 +148,9 @@ { "name": "idmusician" }, + { + "name": "idzookeeper" + }, { "name": "idintern-cadet" },