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 0000000000..c6d617c085
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/icon.png
new file mode 100644
index 0000000000..dc6b222064
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/safarihat.rsi/icon.png differ
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 0000000000..d0faea21a7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/icon.png
new file mode 100644
index 0000000000..69aa30e98d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-left.png
new file mode 100644
index 0000000000..cf7d684c89
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-left.png differ
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 0000000000..3751917642
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/inhand-right.png differ
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 0000000000..bc84017e3a
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 311a4231ba..4986b4191c 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -132,6 +132,9 @@
         },
         {
             "name": "SecurityCadet"
+        },
+        {
+            "name": "Zookeeper"
         }
     ]
 }
diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json
index f9da45e3d3..0d8d045b2a 100644
--- a/Resources/Textures/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/Markers/jobs.rsi/meta.json
@@ -115,6 +115,9 @@
     {
       "name": "mime"
     },
+    {
+      "name": "zookeeper"
+    },
     {
       "name": "reporter"
     },
diff --git a/Resources/Textures/Markers/jobs.rsi/zookeeper.png b/Resources/Textures/Markers/jobs.rsi/zookeeper.png
new file mode 100644
index 0000000000..12eb114423
Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/zookeeper.png differ
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 0000000000..2923bfff37
Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png
new file mode 100644
index 0000000000..c24212aab8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png differ
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"
     },