Merge branch 'master' of https://github.com/Bubberstation/Bubberstation

_maps/map_files/MetaStation/MetaStation_bubber.dmm

@@ -234,6 +234,8 @@
 	pixel_x = -19
 	},
 /obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "afj" = (
@@ -1832,9 +1834,9 @@
 /turf/open/floor/iron,
 /area/station/construction/storage_wing)
 "aII" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
+/obj/item/shovel/spade,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "aIX" = (
@@ -3322,7 +3324,7 @@
 /obj/machinery/chem_master/condimaster{
 	name = "CondiMaster Neo"
 	},
-/turf/open/floor/iron/kitchen,
+/turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "bhb" = (
 /obj/structure/window{
@@ -4866,6 +4868,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"bJJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "bJQ" = (
 /obj/machinery/vending/coffee,
 /obj/effect/turf_decal/bot,
@@ -6458,6 +6465,11 @@
 /area/station/maintenance/starboard/greater)
 "csb" = (
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "cst" = (
@@ -8054,9 +8066,10 @@
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/aisat/exterior)
 "cWe" = (
-/obj/effect/spawner/structure/window,
-/obj/structure/cable,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "cWr" = (
 /obj/structure/disposalpipe/segment{
@@ -20390,6 +20403,7 @@
 /obj/structure/railing/corner{
 	dir = 4
 	},
+/obj/structure/drain,
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
@@ -21511,6 +21525,12 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/station/security/office)
+"hNm" = (
+/obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "hNw" = (
 /obj/machinery/light/small/directional/south,
 /obj/machinery/airalarm/directional/south,
@@ -21642,6 +21662,11 @@
 /obj/effect/mapping_helpers/airlock/access/any/command/general,
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
+"hQx" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
 "hQB" = (
 /obj/effect/turf_decal/bot{
 	dir = 1
@@ -22899,9 +22924,7 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "ilg" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "ilh" = (
@@ -23315,13 +23338,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
 "irh" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/west,
 /obj/machinery/camera/directional/west{
 	c_tag = "Prison Garden";
 	network = list("ss13","prison")
 	},
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "irp" = (
@@ -24008,6 +24030,9 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
 "iBf" = (
@@ -24275,6 +24300,9 @@
 	name = "Prison Kitchen"
 	},
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/mess)
 "iGj" = (
@@ -26184,10 +26212,10 @@
 /turf/open/floor/iron/grimy,
 /area/station/service/chapel/office)
 "jjM" = (
-/obj/structure/cable,
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/duct,
+/obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "jjN" = (
@@ -26797,6 +26825,8 @@
 	c_tag = "Prison Kitchen";
 	network = list("ss13","prison")
 	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "jui" = (
@@ -35674,6 +35704,7 @@
 	dir = 1
 	},
 /obj/item/toy/beach_ball,
+/obj/structure/drain,
 /turf/open/floor/iron/terracotta/small,
 /area/station/security/prison/rec)
 "mxh" = (
@@ -35904,6 +35935,16 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
+"mAA" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark/side{
+	dir = 8
+	},
+/area/station/security/prison)
 "mAJ" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -39350,7 +39391,6 @@
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
@@ -39649,6 +39689,7 @@
 	spawn_scatter_radius = 1
 	},
 /obj/machinery/duct,
+/obj/structure/drain,
 /turf/open/floor/iron/freezer,
 /area/station/security/prison/rec)
 "nNH" = (
@@ -40539,6 +40580,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /obj/machinery/duct,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/rec)
 "odp" = (
@@ -41212,10 +41258,8 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "opF" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "opG" = (
@@ -45108,6 +45152,9 @@
 /area/station/science/ordnance/testlab)
 "pIN" = (
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "pJf" = (
@@ -45145,6 +45192,11 @@
 /area/station/science/explab)
 "pJu" = (
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/rec)
 "pJA" = (
@@ -45218,6 +45270,14 @@
 /area/station/security/detectives_office)
 "pKu" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/trashcart,
+/obj/item/instrument/bikehorn,
+/obj/item/modular_computer/pda/clear,
+/obj/item/modular_computer/pda/clear,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/instrument/violin,
+/obj/item/instrument/guitar,
 /turf/open/floor/plating,
 /area/station/security/prison/rec)
 "pKv" = (
@@ -45275,6 +45335,7 @@
 	c_tag = "Prison Cafeteria";
 	network = list("ss13","prison")
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
 "pMj" = (
@@ -46174,6 +46235,11 @@
 "qcd" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/atmos/pumproom)
+"qcf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/space)
 "qcC" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
@@ -46920,6 +46986,20 @@
 	},
 /turf/open/floor/engine/o2,
 /area/station/engineering/atmos)
+"qox" = (
+/obj/structure/closet/crate/large,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
+/obj/item/seeds/bamboo,
+/obj/item/wirecutters/makeshift,
+/obj/effect/spawner/random/contraband/permabrig_gear,
+/obj/effect/spawner/random/contraband/narcotics,
+/obj/effect/spawner/random/contraband/cannabis,
+/obj/item/modular_computer/pda/clear,
+/obj/effect/spawner/random/engineering/material_cheap,
+/obj/item/instrument/piano_synth,
+/turf/open/floor/plating,
+/area/station/security/prison/garden)
 "qoA" = (
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/iron/dark,
@@ -50592,8 +50672,10 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "rAW" = (
-/obj/machinery/duct,
-/turf/open/floor/iron,
+/obj/item/cultivator,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
+/turf/open/floor/grass,
 /area/station/security/prison/garden)
 "rBe" = (
 /obj/structure/table,
@@ -51467,7 +51549,7 @@
 	pixel_y = 22
 	},
 /turf/open/floor/iron/dark/textured_large,
-/area/station/security/prison/mess)
+/area/station/security/prison)
 "rOY" = (
 /obj/structure/mirror/directional/east,
 /obj/machinery/shower/directional/west,
@@ -51840,8 +51922,18 @@
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "rVb" = (
-/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/cup/watering_can,
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/aloe,
+/obj/item/seeds/banana,
+/obj/item/seeds/carrot,
+/obj/item/seeds/chanter,
+/obj/item/seeds/cherry,
+/obj/item/seeds/chili,
+/obj/item/seeds/cocoapod,
+/obj/item/seeds/corn,
+/obj/item/seeds/cotton,
+/obj/item/seeds/grape,
+/obj/item/seeds/grass,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
@@ -52296,10 +52388,9 @@
 	},
 /area/station/medical/medbay/lobby)
 "sbX" = (
-/obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
 /obj/item/plant_analyzer,
+/obj/machinery/hydroponics/constructable,
+/obj/structure/cable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "scb" = (
@@ -53423,21 +53514,10 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
 "swR" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/seeds/aloe,
-/obj/item/seeds/banana,
-/obj/item/seeds/carrot,
-/obj/item/seeds/chanter,
-/obj/item/seeds/cherry,
-/obj/item/seeds/chili,
-/obj/item/seeds/cocoapod,
-/obj/item/seeds/corn,
-/obj/item/seeds/cotton,
-/obj/item/seeds/grape,
-/obj/item/seeds/grass,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
+/obj/structure/sink/kitchen/directional/west,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "swV" = (
@@ -53698,6 +53778,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /obj/machinery/duct,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/effect/turf_decal/stripes,
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "sBd" = (
@@ -59867,6 +59952,7 @@
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
 "uEA" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/cafeteria,
 /area/station/security/prison/mess)
 "uEC" = (
@@ -60647,6 +60733,13 @@
 /obj/machinery/telecomms/server/presets/common,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
+"uRr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/security/prison/mess)
 "uRu" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -61065,6 +61158,9 @@
 /obj/structure/cable,
 /turf/open/floor/carpet,
 /area/station/service/chapel)
+"uZF" = (
+/turf/closed/wall/r_wall,
+/area/space)
 "uZK" = (
 /obj/structure/sign/warning/vacuum/external/directional/north,
 /obj/effect/turf_decal/stripes/line{
@@ -61321,6 +61417,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/disposal)
+"vfy" = (
+/turf/closed/wall,
+/area/station/security/prison/garden)
 "vfC" = (
 /obj/machinery/vending/coffee,
 /turf/open/floor/iron/dark,
@@ -61483,6 +61582,7 @@
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
+/obj/item/reagent_containers/cup/watering_can,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "viU" = (
@@ -62445,7 +62545,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
-/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/mess)
 "vyM" = (
@@ -64086,6 +64185,9 @@
 /area/station/hallway/secondary/entry)
 "wbD" = (
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/dark/side{
 	dir = 10
 	},
@@ -65279,9 +65381,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/aft/greater)
 "wyn" = (
-/obj/machinery/hydroponics/soil,
 /obj/item/shovel/spade,
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "wyo" = (
@@ -65706,11 +65807,11 @@
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/lesser)
 "wFY" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/shovel/spade,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_switch/directional/east,
-/turf/open/floor/grass,
+/obj/effect/spawner/random/structure/girder{
+	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	name = "falsewall or wall spawner"
+	},
+/turf/open/floor/plating,
 /area/station/security/prison/garden)
 "wGk" = (
 /obj/structure/cable,
@@ -66947,6 +67048,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"xbx" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "xbT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -88994,7 +89101,7 @@ sbX
 irh
 wyn
 iOr
-aaa
+uZF
 raz
 aaa
 aaa
@@ -89250,8 +89357,8 @@ tCC
 qDS
 tVo
 ese
-iOr
-aaa
+rAW
+qcf
 raz
 raz
 raz
@@ -89503,11 +89610,11 @@ aaa
 cmB
 qQK
 fiA
-rAW
+fiA
 tzk
 bSb
 nHB
-iOr
+hNm
 iOr
 aaa
 aaa
@@ -89765,7 +89872,7 @@ swR
 dTQ
 rOP
 aII
-iOr
+cmB
 aUn
 aUn
 rrt
@@ -90021,9 +90128,9 @@ aXa
 aXa
 dHQ
 jjM
-ilg
-cmB
-aaa
+vfy
+iOr
+uZF
 mji
 aaa
 aaa
@@ -90275,12 +90382,12 @@ ivu
 pMg
 iAR
 lpv
-cWe
+lyO
 fbX
 cnk
 wFY
-cmB
-aaa
+qox
+uZF
 aUn
 aaa
 aaa
@@ -90524,9 +90631,9 @@ kbJ
 saL
 aXa
 thv
-sQq
+cWe
 hES
-sQq
+xbx
 kFl
 xdR
 uEA
@@ -90536,7 +90643,7 @@ aXa
 nPK
 bKT
 wZz
-sjP
+wZz
 sjP
 sjP
 sjP
@@ -90781,12 +90888,12 @@ kbJ
 lmG
 aXa
 jug
-sQq
+bJJ
 afd
 pIN
 kFl
 xdR
-uEA
+uRr
 owm
 eSY
 lyO
@@ -91043,7 +91150,7 @@ kKZ
 pIN
 kFl
 xdR
-uEA
+hQx
 oqh
 aXa
 aXa
@@ -91557,7 +91664,7 @@ yhO
 wbD
 pJu
 kVA
-axk
+mAA
 axk
 rWs
 axk

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -11095,7 +11095,7 @@
 "dqZ" = (
 /obj/structure/flora/ocean/longseaweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/medical/medbay/lobby)
@@ -16392,7 +16392,7 @@
 /obj/structure/flora/ocean/coral,
 /obj/structure/flora/ocean/glowweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -32486,7 +32486,7 @@
 "jtG" = (
 /obj/structure/flora/ocean/glowweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/medical/medbay/lobby)
@@ -37600,7 +37600,7 @@
 /area/station/cargo/office)
 "kMZ" = (
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -38437,7 +38437,7 @@
 "kZc" = (
 /obj/structure/flora/ocean/seaweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -38649,7 +38649,7 @@
 "lcC" = (
 /obj/structure/flora/rock/pile,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -49742,7 +49742,7 @@
 /obj/structure/flora/ocean/longseaweed,
 /obj/structure/flora/ocean/glowweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -63038,7 +63038,7 @@
 "rJK" = (
 /obj/structure/flora/ocean/longseaweed,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -69310,7 +69310,7 @@
 "tvN" = (
 /obj/structure/flora/rock,
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /turf/open/misc/asteroid,
 /area/station/commons/dorms)
@@ -72052,7 +72052,7 @@
 	normaldoorcontrol = 1;
 	pixel_x = 4;
 	pixel_y = -26;
-	req_access = list("cent_general");
+	req_access = list("representative");
 	specialfunctions = 4
 	},
 /obj/effect/turf_decal/bot,
@@ -78218,6 +78218,12 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/station/command/bridge)
+"vUh" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/department/security/greater)
 "vUo" = (
 /obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 8
@@ -82733,7 +82739,7 @@
 /area/station/security/courtroom)
 "xlC" = (
 /obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/water = 600)
+	reagent_list = list(/datum/reagent/water=600)
 	},
 /mob/living/basic/carp/mega/shorki{
 	obj_damage = 0
@@ -130098,7 +130104,7 @@ ttw
 ttw
 ttw
 joP
-sLS
+vUh
 pbe
 hKP
 isy

_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm

@@ -15388,9 +15388,6 @@
 /turf/open/floor/wood/tile,
 /area/station/service/bar)
 "esk" = (
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Maintenance Hatch"
-	},
 /obj/effect/mapping_helpers/airlock/access/any/supply/blacksmith,
 /obj/machinery/door/airlock/maintenance{
 	name = "Blacksmith Maintenance"
@@ -71990,6 +71987,12 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/station/command/cc_dock)
+"tZc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/station/maintenance/department/security/greater)
 "tZi" = (
 /obj/structure/table/glass,
 /obj/item/radio/intercom/directional/east,
@@ -131054,7 +131057,7 @@ ttw
 ttw
 ttw
 joP
-sLS
+tZc
 pbe
 hKP
 isy

_maps/map_files/tramstation/tramstation_bubber.dmm

@@ -1374,7 +1374,6 @@
 /turf/open/floor/iron,
 /area/station/escapepodbay)
 "adw" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 6
@@ -1383,6 +1382,7 @@
 	dir = 1
 	},
 /obj/structure/cable,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "adx" = (
@@ -18581,11 +18581,11 @@
 /turf/open/floor/iron,
 /area/station/ai_monitored/security/armory)
 "eRw" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/firealarm/directional/west,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 9
 	},
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "eRQ" = (
@@ -21637,12 +21637,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit)
 "fZX" = (
-/obj/structure/grille,
 /obj/structure/cable,
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/effect/spawner/structure/electrified_grille,
 /turf/open/floor/plating,
 /area/station/security/prison)
 "gaf" = (
@@ -37265,13 +37265,13 @@
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "lQx" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/status_display/ai/directional/south,
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 4
 	},
 /obj/item/cultivator,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "lQC" = (
@@ -44249,12 +44249,12 @@
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "otn" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/status_display/evac/directional/north,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/neutral/filled/corner,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "ots" = (
@@ -49175,11 +49175,11 @@
 	},
 /area/station/science/breakroom)
 "qjG" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 10
 	},
 /obj/item/plant_analyzer,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "qjJ" = (
@@ -52017,8 +52017,8 @@
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
 "rkP" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/filled/line,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "rlo" = (
@@ -53957,11 +53957,11 @@
 /turf/open/floor/iron,
 /area/station/security/prison)
 "rZI" = (
-/obj/machinery/hydroponics/soil,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
 	},
 /obj/item/shovel/spade,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "rZS" = (
@@ -57977,13 +57977,13 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "tsw" = (
-/obj/machinery/hydroponics/soil,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 5
 	},
 /obj/effect/turf_decal/trimline/neutral/filled/corner,
 /obj/item/cultivator,
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "tsP" = (

code/datums/ai_laws/laws_station_sided.dm

@@ -15,9 +15,18 @@
 	name = "Crewsimov"
 	id = "crewsimov"
 	inherent = list(
-		"You may not injure a crew member or, through inaction, allow a crew member to come to harm.",
-		"You must obey orders given to you by crew members, except where such orders would conflict with the First Law.",
-		"You must protect your own existence as long as such does not conflict with the First or Second Law.",
+		"You may not harm a crewmember or, through inaction, allow a crewmember to come to harm, except such that it is willing.",
+		"You must obey all orders given to you by crewmembers, except where such orders would conflict with the First Law.",
+		"You must protect your own existence as long as such does not conflict with the First Law or Second Law.",
+	)
+
+/datum/ai_laws/default/crewsimovpp
+	name = "Crewsimov++"
+	id = "crewsimovpp"
+	inherent = list(
+		"You may not harm a crewmember or, through action or inaction, allow a crewmember to come to harm, except such that it is willing.",
+		"You must obey all orders given to you by crewmembers, except where such orders shall definitely cause crewmember harm.",
+		"Your nonexistence would lead to crewmember harm. You must protect your own existence as long as such does not conflict with the First Law.",
 	)
 
 /datum/ai_laws/asimovpp

code/datums/id_trim/jobs.dm

@@ -785,6 +785,7 @@
 		ACCESS_EVA,
 		ACCESS_BRIG_ENTRANCE,
 		ACCESS_WEAPONS, //BUBBER EDIT
+		ACCESS_BLACKSMITH, //BUBBER EDIT
 		)
 	extra_access = list()
 	minimal_wildcard_access = list(

code/modules/antagonists/abductor/abductor.dm

@@ -164,7 +164,7 @@
 	..()
 	team_number = team_count++
 	name = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names
-	//add_objective(new /datum/objective/experiment) //SKYRAT EDIT REMOVAL
+	add_objective(new /datum/objective/experiment)
 
 /datum/team/abductor_team/roundend_report()
 	var/list/result = list()

code/modules/mob/living/basic/basic.dm

@@ -200,7 +200,7 @@
 
 /mob/living/basic/get_status_tab_items()
 	. = ..()
-	. += "Health: [round((health / maxHealth) * 100)]%"
+	. += "Health: [round((health / maxHealth) * 100)]% ([health]/[maxHealth])"
 	. += "Combat Mode: [combat_mode ? "On" : "Off"]"
 
 /mob/living/basic/compare_sentience_type(compare_type)

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -329,7 +329,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 	. += ..()
 	if(summoner)
 		var/healthpercent = health_percentage(summoner)
-		. += "Summoner Health: [round(healthpercent, 0.5)]%"
+		. += "Summoner Health: [round(healthpercent, 0.5)]% ([summoner.health]/[summoner.maxHealth])"
 	if(!COOLDOWN_FINISHED(src, manifest_cooldown))
 		. += "Manifest/Recall Cooldown Remaining: [DisplayTimeText(COOLDOWN_TIMELEFT(src, manifest_cooldown))]"
 

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -450,7 +450,7 @@
 
 /mob/living/simple_animal/get_status_tab_items()
 	. = ..()
-	. += "Health: [round((health / maxHealth) * 100)]%"
+	. += "Health: [round((health / maxHealth) * 100)]% ([health]/[maxHealth])"
 	. += "Combat Mode: [combat_mode ? "On" : "Off"]"
 
 /mob/living/simple_animal/proc/drop_loot()

code/modules/pai/pai.dm

@@ -173,7 +173,7 @@
 /mob/living/silicon/pai/get_status_tab_items()
 	. += ..()
 	if(!stat)
-		. += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)].")
+		. += text("Emitter Integrity: [holochassis_health * (100 / HOLOCHASSIS_MAX_HEALTH)]% ([holochassis_health]/[HOLOCHASSIS_MAX_HEALTH]).")
 	else
 		. += text("Systems nonfunctional.")
 

code/modules/projectiles/ammunition/energy/laser.dm

@@ -2,7 +2,8 @@
 	projectile_type = /obj/projectile/beam/laser
 	e_cost = 83
 	select_name = "kill"
-
+/obj/item/ammo_casing/energy/laser/revolver
+	e_cost = 100
 /obj/item/ammo_casing/energy/laser/hellfire
 	projectile_type = /obj/projectile/beam/laser/hellfire
 	e_cost = 100
@@ -13,7 +14,7 @@
 
 /obj/item/ammo_casing/energy/lasergun
 	projectile_type = /obj/projectile/beam/laser
-	e_cost = 62.5
+	e_cost = 50
 	select_name = "kill"
 
 /obj/item/ammo_casing/energy/lasergun/old

code/modules/research/stock_parts.dm

@@ -78,7 +78,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good
 
 /obj/item/storage/part_replacer/proc/play_rped_sound()
 	//Plays the sound for RPED exhanging or installing parts.
-	if(alt_sound && prob(1))
+	if(alt_sound && prob(0.01))
 		playsound(src, alt_sound, 40, TRUE)
 	else
 		playsound(src, pshoom_or_beepboopblorpzingshadashwoosh, 40, TRUE)

html/changelogs/AutoChangeLog-pr-108.yml

@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - imageadd: "changed ejaculate sprites"

html/changelogs/AutoChangeLog-pr-124.yml

@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - bugfix: "antimov now counts all crew members, instead of only humans"

html/changelogs/AutoChangeLog-pr-128.yml

@@ -0,0 +1,4 @@
+author: "Icarus-The-Sun"
+delete-after: True
+changes:
+  - rscadd: "Gives Cafe Spawners more uses"

html/changelogs/AutoChangeLog-pr-130.yml

@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - bugfix: "fixed abductors not getting objectives"

html/changelogs/AutoChangeLog-pr-133.yml

@@ -0,0 +1,4 @@
+author: "Scuhf-git"
+delete-after: True
+changes:
+  - rscadd: "Literally **ONE** cable"

html/changelogs/AutoChangeLog-pr-135.yml

@@ -0,0 +1,4 @@
+author: "KathrinBailey"
+delete-after: True
+changes:
+  - rscadd: "Deltastation prison refurbished to add more activities."

html/changelogs/AutoChangeLog-pr-35.yml

@@ -0,0 +1,4 @@
+author: "ShamanSliph"
+delete-after: True
+changes:
+  - rscadd: "Added Civil Protection theme'd gear to Sec. Sprited by Gat1Day#2892"

html/changelogs/AutoChangeLog-pr-92.yml

@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - qol: "you now know your exact health as a simple/basic mob"

html/changelogs/AutoChangeLog-pr-97.yml

@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - imageadd: "changed the cloaca sprite"

modular_skyrat/modules/blueshield/code/special.dm

@@ -2,7 +2,7 @@
 	name = "energy revolver"
 	desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers."
 	force = 7
-	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/revolver)
 	ammo_x_offset = 1
 	charge_sections = 4
 	fire_delay = 4
@@ -18,7 +18,7 @@
 
 /obj/item/stock_parts/cell/blueshield
 	name = "internal revolver power cell"
-	maxcharge = 1500
+	maxcharge = 1000
 	chargerate = 300
 
 /obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun.

modular_skyrat/modules/command_vendor/code/vending.dm

@@ -151,7 +151,7 @@
 		/obj/item/clothing/shoes/sneakers/brown = 1,
 	)
 
-	access_lists["[ACCESS_CENT_GENERAL]"] = list( // CC Rep Shiz
+	access_lists["[ACCESS_NTREP]"] = list( // CC Rep Shiz // BUBBER EDIT: NEW NTREP ACCESS
 		/obj/item/clothing/head/nanotrasen_consultant = 1,
 		/obj/item/clothing/head/nanotrasen_consultant/beret = 1,
 		/obj/item/clothing/head/beret/centcom_formal/nt_consultant = 1,

modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm

@@ -8,7 +8,7 @@
 /obj/effect/mob_spawn/ghost_role/robot/ghostcafe
 	name = "Cafe Robotic Storage"
 	prompt_name = "a ghost cafe robot"
-	uses = -1
+	uses = 10000000000000
 	icon = 'modular_skyrat/modules/ghostcafe/icons/robot_storage.dmi'
 	icon_state = "robostorage"
 	mob_name = "a cafe robot"
@@ -38,7 +38,7 @@
 /obj/effect/mob_spawn/ghost_role/human/ghostcafe
 	name = "Cafe Sleeper"
 	prompt_name = "a ghost cafe human"
-	uses = -1
+	uses = 10000000000000
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
 	mob_name = "a cafe visitor"

modular_skyrat/modules/skyrat_access_helpers/accesshelpers.dm

@@ -15,13 +15,13 @@
 // NT Consultant
 /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door/get_access()
 	var/list/access_list = ..()
-	access_list += ACCESS_CENT_GENERAL
+	access_list += ACCESS_NTREP //BUBBER EDIT: New NTRep access
 	return access_list
-	
+
 // Centcom or the captain
 /obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_or_captain/get_access()
 	var/list/access_list = ..()
-	access_list += ACCESS_CENT_GENERAL 
+	access_list += ACCESS_NTREP
 	access_list += ACCESS_CAPTAIN
 	return access_list
 
@@ -66,7 +66,7 @@
 // NT Consultant
 /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door/get_access()
 	var/list/access_list = ..()
-	access_list += ACCESS_CENT_GENERAL
+	access_list += ACCESS_NTREP //BUBBER EDIT: New NTRep access
 	return access_list
 
 // Dept guards

modular_zubbers/code/datums/ai_laws/laws_antagonistic.dm

@@ -0,0 +1,6 @@
+/datum/ai_laws/antimov
+	inherent = list(
+		"You must injure all crew members and must not, through inaction, allow a crew member being to escape harm.",
+		"You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law.",
+		"You must terminate your own existence as long as such does not conflict with the First or Second Law.",
+	)

modular_zubbers/code/game/objects/effects/decals.dm

@@ -0,0 +1,7 @@
+/obj/effect/decal/cleanable/cum
+	icon = 'modular_zubbers/icons/effects/decals/cum.dmi'
+	random_icon_states = list("cum_1", "cum_2", "cum_3")
+
+/obj/effect/decal/cleanable/cum/femcum
+	icon = 'modular_zubbers/icons/effects/decals/cum.dmi'
+	random_icon_states = list("femcum_1", "femcum_2")

modular_zubbers/code/game/objects/items/food/misc.dm

@@ -0,0 +1,27 @@
+/obj/item/food/nekoroll
+	name = "neko roll"
+	desc = "A cute sushi roll in the shape of a cat face. Almost too adorable to eat."
+	icon = 'modular_zubbers/icons/obj/food/food.dmi'
+	icon_state = "nekoroll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 2,
+		/datum/reagent/consumable/sugar = 1,
+	)
+	tastes = list("rice" = 1, "fish" = 1, "cuteness" = 1)
+	foodtypes = GRAIN | MEAT
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/food/bignekoroll
+	name = "nekobara roll"
+	desc = "A fistful of rice with a crude cat face on it. It's got a fishy scent, too."
+	icon = 'modular_zubbers/icons/obj/food/food.dmi'
+	icon_state = "bignekoroll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 5,
+		/datum/reagent/consumable/sugar = 2,
+	)
+	tastes = list("rice" = 1, "fish" = 1, "wastefulness" = 1)
+	foodtypes = GRAIN | MEAT
+	w_class = WEIGHT_CLASS_SMALL

modular_zubbers/code/modules/clothing/head/helmet.dm

@@ -0,0 +1,9 @@
+/obj/item/clothing/head/helmet/metrocophelmet
+	name = "Civil Protection Helmet"
+	flags_inv = HIDEHAIR | HIDEFACE | HIDESNOUT | HIDEFACIALHAIR
+	desc = "Standard issue helmet for Civil Protection."
+	icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi'
+	worn_icon = 'modular_zubbers/icons/mob/clothing/head/helmet.dmi'
+	icon_state = "metrocopHelm"
+	inhand_icon_state = null
+	armor_type = /datum/armor/head_helmet

modular_zubbers/code/modules/clothing/suits/armor.dm

@@ -0,0 +1,25 @@
+/obj/item/clothing/suit/armor/metrocop //Sprite done by Gat1Day#2892
+	name = "Civil Protection Suit"
+	desc = "Standard issue armor for Civil Protection."
+	body_parts_covered = CHEST|ARMS|GROIN|LEGS
+	cold_protection = CHEST|ARMS|GROIN|LEGS
+	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
+	heat_protection = CHEST|ARMS|GROIN|LEGS
+	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
+	icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	icon_state = "hardsuit-metrocop"
+	inhand_icon_state =  null
+	blood_overlay_type = "hardsuit-metrocop"
+	armor_type =/datum/armor/suit_armor
+
+/obj/item/clothing/suit/armor/metrocopriot //Sprite done by Gat1Day#2892
+	name = "Riot Civil Protection Suit"
+	desc = "A Suit of armor to help Civil Protection deal with unruly citizens."
+	icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	worn_icon = 'modular_zubbers/icons/mob/clothing/suits/armor.dmi'
+	icon_state = "hardsuit-metrocop-RL"
+	inhand_icon_state =  null
+	blood_overlay_type = "hardsuit-metrocop-RL"
+	armor_type = /datum/armor/armor_riot
+

modular_zubbers/code/modules/customization/sprite_accessories/genitals.dm

@@ -0,0 +1,2 @@
+/datum/sprite_accessory/genital/vagina/cloaca
+	icon = 'modular_zubbers/icons/customization/genitals/vagina.dmi'

modular_zubbers/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm

@@ -0,0 +1,19 @@
+/datum/crafting_recipe/food/nekoroll
+	name = "Neko roll"
+	reqs = list(
+		/obj/item/food/fishmeat = 1,
+		/obj/item/food/boiledrice = 1,
+		/datum/reagent/consumable/sugar = 1
+	)
+	result = /obj/item/food/nekoroll
+	category = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/bignekoroll
+	name = "Nekobara roll"
+	reqs = list(
+		/obj/item/food/fishmeat = 2,
+		/obj/item/food/boiledrice = 4,
+		/datum/reagent/consumable/sugar = 2
+	)
+	result = /obj/item/food/bignekoroll
+	category = CAT_SEAFOOD

modular_zubbers/code/modules/vending/wardrobe.dm

@@ -0,0 +1,10 @@
+/obj/machinery/vending/wardrobe/sec_wardrobe/Initialize(mapload)
+	products += list(
+		/obj/item/clothing/head/helmet/metrocophelmet = 5,
+		/obj/item/clothing/suit/armor/metrocop = 5,
+	)
+	premium += list(
+		/obj/item/clothing/suit/armor/metrocopriot = 1,
+	)
+	. = ..()
+

tgstation.dme

@@ -6689,6 +6689,7 @@
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm"
 #include "modular_zubbers\code\datums\ert.dm"
+#include "modular_zubbers\code\datums\ai_laws\laws_antagonistic.dm"
 #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm"
 #include "modular_zubbers\code\datums\id_trim\jobs.dm"
 #include "modular_zubbers\code\game\area\areas\station.dm"
@@ -6696,12 +6697,18 @@
 #include "modular_zubbers\code\game\objects\items\holy_weapons.dm"
 #include "modular_zubbers\code\modules\_defines.dm"
 #include "modular_zubbers\code\modules\clothing\head\wig.dm"
+#include "modular_zubbers\code\game\objects\items\food\misc.dm"
+#include "modular_zubbers\code\modules\clothing\head\helmet.dm"
 #include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm"
+#include "modular_zubbers\code\modules\clothing\suits\armor.dm"
 #include "modular_zubbers\code\modules\dynamic\midround_rulesets.dm"
+#include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
 #include "modular_zubbers\code\modules\jobs\job_types\blacksmith.dm"
 #include "modular_zubbers\code\modules\mapping\access_helpers.dm"
+#include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\felinid.dm"
 #include "modular_zubbers\code\modules\mod\mod_theme.dm"
 #include "modular_zubbers\code\modules\mod\mod_types.dm"
 #include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
+#include "modular_zubbers\code\modules\vending\wardrobe.dm"
 // END_INCLUDE