From d3692922ef7de13edc318719df7b393e6d0ea1ce Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 23 Nov 2021 17:02:47 +0000
Subject: [PATCH] [MIRROR] Donuts found in sec vendors and boxes can now be
 used to make glazed donuts [MDB IGNORE] (#9559)

* Donuts found in sec vendors and boxes can now be used to make glazed donuts (#62910)

* Donuts found in sec vendors and boxes can now be used to make glazed donuts

* Hopefully fixes CI

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
---
 _maps/RandomZLevels/wildwest.dmm              |   12 +-
 _maps/RandomZLevels/wildwest_skyrat.dmm       |    8 +-
 _maps/map_files/KiloStation/KiloStation.dmm   | 1062 ++++++++---------
 .../KiloStation/KiloStation_skyrat.dmm        |    2 +-
 .../WaterKiloStation/WaterKiloStation.dmm     |    8 +-
 _maps/shuttles/emergency_cruise.dmm           |    2 +-
 code/datums/recipe.dm                         |    2 +-
 code/game/objects/items/food/pastries.dm      |    6 +-
 code/game/objects/items/storage/fancy.dm      |    2 +-
 code/modules/vending/security.dm              |    2 +-
 .../modules/sec_haul/code/misc/vending.dm     |    2 +-
 11 files changed, 550 insertions(+), 558 deletions(-)

diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm
index 4988a8ead78..8a76032ca12 100644
--- a/_maps/RandomZLevels/wildwest.dmm
+++ b/_maps/RandomZLevels/wildwest.dmm
@@ -909,7 +909,7 @@
 /area/awaymission/wildwest/mines)
 "dY" = (
 /obj/structure/table/wood,
-/obj/item/food/donut/jelly/slimejelly,
+/obj/item/food/donut/jelly/slimejelly/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "dZ" = (
@@ -919,12 +919,12 @@
 /area/awaymission/wildwest/mines)
 "ea" = (
 /obj/structure/table/wood,
-/obj/item/food/donut/jelly,
+/obj/item/food/donut/jelly/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "eb" = (
 /obj/structure/table/wood,
-/obj/item/food/donut,
+/obj/item/food/donut/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "ec" = (
@@ -1070,7 +1070,7 @@
 "eG" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/food/donut/jelly/slimejelly,
+/obj/item/food/donut/jelly/slimejelly/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "eH" = (
@@ -1715,10 +1715,6 @@
 	},
 /turf/open/floor/grass,
 /area/awaymission/wildwest/gov)
-"Gw" = (
-/obj/structure/chair/stool/directional/east,
-/turf/open/floor/carpet,
-/area/awaymission/wildwest/mines)
 "Kh" = (
 /obj/machinery/door/airlock/external/ruin,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
diff --git a/_maps/RandomZLevels/wildwest_skyrat.dmm b/_maps/RandomZLevels/wildwest_skyrat.dmm
index d22595ab942..f9eab8e64ea 100644
--- a/_maps/RandomZLevels/wildwest_skyrat.dmm
+++ b/_maps/RandomZLevels/wildwest_skyrat.dmm
@@ -466,7 +466,7 @@
 /area/awaymission/wildwest/mines)
 "dv" = (
 /obj/structure/table/wood,
-/obj/item/food/donut/jelly,
+/obj/item/food/donut/jelly/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "dw" = (
@@ -2781,7 +2781,7 @@
 /area/awaymission/wildwest/mines)
 "LM" = (
 /obj/structure/table/wood,
-/obj/item/food/donut/jelly/slimejelly,
+/obj/item/food/donut/jelly/slimejelly/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "LO" = (
@@ -2805,7 +2805,7 @@
 /area/awaymission/wildwest/mines)
 "Me" = (
 /obj/structure/table/wood,
-/obj/item/food/donut,
+/obj/item/food/donut/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "Ml" = (
@@ -3091,7 +3091,7 @@
 "QI" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/food/donut/jelly/slimejelly,
+/obj/item/food/donut/jelly/slimejelly/plain,
 /turf/open/floor/carpet,
 /area/awaymission/wildwest/mines)
 "QM" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 597361b58f7..c4d30a5d5f3 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -95,6 +95,10 @@
 	},
 /turf/open/floor/engine,
 /area/ai_monitored/turret_protected/ai)
+"aax" = (
+/obj/item/beacon,
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "aay" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -747,6 +751,16 @@
 /obj/structure/sign/warning/securearea,
 /turf/closed/wall/r_wall/rust,
 /area/ai_monitored/turret_protected/aisat_interior)
+"adW" = (
+/obj/machinery/ai_slipper{
+	uses = 10
+	},
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/engine,
+/area/ai_monitored/turret_protected/aisat/foyer)
 "adZ" = (
 /obj/machinery/door/airlock/external{
 	name = "Satellite External Airlock";
@@ -1666,6 +1680,13 @@
 /obj/structure/sign/poster/official/random,
 /turf/closed/wall,
 /area/hallway/primary/fore)
+"ahz" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/item/beacon,
+/turf/open/floor/engine,
+/area/ai_monitored/turret_protected/aisat/foyer)
 "ahD" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -5896,6 +5917,12 @@
 /obj/machinery/mechpad,
 /turf/open/floor/iron/dark,
 /area/science/robotics/mechbay)
+"aDa" = (
+/obj/effect/turf_decal/siding/purple{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/science/robotics/mechbay)
 "aDc" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
@@ -6648,6 +6675,27 @@
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/iron,
 /area/hallway/primary/fore)
+"aIs" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 4
+	},
+/obj/item/beacon,
+/turf/open/floor/iron,
+/area/hallway/primary/fore)
 "aIv" = (
 /obj/docking_port/stationary{
 	dir = 4;
@@ -6914,11 +6962,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/maintenance/port)
-"aKB" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/holopad,
-/turf/open/floor/iron,
-/area/ai_monitored/command/storage/eva)
 "aKC" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
@@ -18997,6 +19040,11 @@
 	},
 /turf/open/floor/engine/vacuum,
 /area/science/test_area)
+"ccE" = (
+/obj/item/beacon,
+/obj/effect/turf_decal/box,
+/turf/open/floor/engine/vacuum,
+/area/science/test_area)
 "ccF" = (
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/engine/vacuum,
@@ -19072,6 +19120,16 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
+"ccR" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/item/beacon,
+/turf/open/floor/iron,
+/area/security/courtroom)
 "ccU" = (
 /obj/machinery/telecomms/processor/preset_four,
 /obj/structure/cable,
@@ -19123,6 +19181,20 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/primary/aft)
+"cdj" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/item/beacon,
+/turf/open/floor/iron,
+/area/hallway/primary/aft)
 "cdl" = (
 /obj/structure/transit_tube/curved/flipped,
 /obj/structure/lattice,
@@ -19871,26 +19943,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
-"cgW" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/structure/rack,
-/obj/item/crowbar/red,
-/obj/item/wrench,
-/obj/item/electropack,
-/obj/item/assembly/signaler{
-	pixel_x = 6
-	},
-/obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/peppertank/directional/east,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron/dark,
-/area/security/execution/education)
 "cgX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -21489,6 +21541,21 @@
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/aft)
+"cpQ" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/item/beacon,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/hallway/primary/aft)
 "cpT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -23494,35 +23561,6 @@
 /obj/structure/closet/wardrobe/mixed,
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
-"cAh" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/obj/item/radio{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/obj/item/pen,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/east,
-/obj/structure/reagent_dispensers/peppertank/directional/south,
-/obj/machinery/camera/directional/east{
-	c_tag = "Science Security Post";
-	name = "science camera";
-	network = list("ss13","rd")
-	},
-/obj/machinery/button/door/directional/south{
-	id = "Biohazard";
-	name = "Emergency Research Lockdown";
-	pixel_x = 24;
-	req_access_txt = "47"
-	},
-/turf/open/floor/iron/dark,
-/area/security/checkpoint/science/research)
 "cAr" = (
 /obj/structure/table,
 /obj/machinery/recharger,
@@ -24090,24 +24128,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/maintenance/starboard/fore)
-"cEu" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/item/clipboard,
-/obj/item/clothing/accessory/armband/deputy,
-/obj/item/clothing/accessory/armband/deputy,
-/obj/item/clothing/accessory/armband/deputy,
-/obj/item/clothing/accessory/armband/deputy,
-/obj/item/clothing/accessory/armband/deputy,
-/obj/item/food/donut,
-/obj/item/inspector,
-/turf/open/floor/iron/dark,
-/area/security/office)
 "cEw" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/reagent_dispensers/fueltank,
@@ -24648,20 +24668,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/showroomfloor,
 /area/ai_monitored/security/armory)
-"cHM" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/item/beacon,
-/turf/open/floor/iron,
-/area/hallway/primary/aft)
 "cHN" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/effect/turf_decal/stripes/line{
@@ -27173,11 +27179,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ai_monitored/command/storage/eva)
-"dvK" = (
-/obj/item/beacon,
-/obj/effect/turf_decal/box,
-/turf/open/floor/engine/vacuum,
-/area/science/test_area)
 "dvN" = (
 /turf/open/floor/plating/asteroid/lowpressure,
 /area/space/nearstation)
@@ -27221,6 +27222,14 @@
 "dws" = (
 /turf/open/floor/carpet/royalblue,
 /area/command/heads_quarters/captain)
+"dwu" = (
+/obj/machinery/camera/directional/north{
+	c_tag = "Xenobiology Test Chamber";
+	name = "xenobiology camera";
+	network = list("ss13","rd","xeno")
+	},
+/turf/open/floor/engine,
+/area/science/xenobiology)
 "dwU" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -27298,22 +27307,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/cargo/storage)
-"dzz" = (
-/obj/structure/table,
-/obj/item/storage/box/deputy,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/machinery/camera/directional/west{
-	c_tag = "Warden's Office"
-	},
-/obj/structure/reagent_dispensers/peppertank/directional/west,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
-/area/security/warden)
 "dzB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/showroomfloor,
@@ -28702,6 +28695,22 @@
 	luminosity = 2
 	},
 /area/science/robotics/mechbay)
+"eaV" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/item/beacon,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/engineering/atmos)
 "ebd" = (
 /obj/structure/closet/firecloset,
 /obj/effect/turf_decal/bot,
@@ -31251,21 +31260,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/primary/aft)
-"eVT" = (
-/obj/effect/turf_decal/tile/brown,
-/obj/effect/turf_decal/tile/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
-	},
-/obj/machinery/computer/cargo/request,
-/turf/open/floor/iron,
-/area/hallway/primary/starboard)
 "eWh" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible{
 	dir = 4
@@ -31854,6 +31848,22 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/cargo/warehouse)
+"fgr" = (
+/obj/structure/table,
+/obj/item/storage/box/deputy,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
+/obj/machinery/camera/directional/west{
+	c_tag = "Warden's Office"
+	},
+/obj/structure/reagent_dispensers/peppertank/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/dark,
+/area/security/warden)
 "fgG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -32164,6 +32174,17 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/security/office)
+"fnj" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/item/beacon,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/iron,
+/area/command/teleporter)
 "fno" = (
 /turf/closed/wall/r_wall/rust,
 /area/command/bridge)
@@ -33508,6 +33529,22 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/port/aft)
+"fKu" = (
+/obj/structure/closet/secure_closet/security/engine,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/machinery/light/directional/south,
+/obj/structure/reagent_dispensers/peppertank/directional/south,
+/obj/item/crowbar,
+/obj/item/book/manual/wiki/security_space_law,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/security/checkpoint/engineering)
 "fKw" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security{
@@ -34170,20 +34207,6 @@
 "gcd" = (
 /turf/open/floor/iron/showroomfloor,
 /area/service/kitchen)
-"gcU" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/command/gateway)
 "gdo" = (
 /obj/machinery/door/firedoor/heavy,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -34508,10 +34531,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/showroomfloor,
 /area/medical/chemistry)
-"gjp" = (
-/obj/item/beacon,
-/turf/open/floor/iron/dark,
-/area/command/bridge)
 "gjF" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/reagent_dispensers/fueltank,
@@ -34548,29 +34567,6 @@
 	},
 /turf/open/floor/iron,
 /area/command/heads_quarters/ce)
-"gjK" = (
-/obj/item/storage/box/chemimp{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/obj/item/storage/box/trackimp{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/machinery/light/directional/south,
-/obj/structure/reagent_dispensers/peppertank/directional/south,
-/obj/item/storage/box/firingpins,
-/obj/item/storage/box/firingpins,
-/obj/item/storage/lockbox/loyalty,
-/turf/open/floor/iron/dark,
-/area/ai_monitored/security/armory)
 "gkb" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -35179,17 +35175,6 @@
 	icon_state = "wood-broken7"
 	},
 /area/service/chapel/office)
-"gvO" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/item/beacon,
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/iron,
-/area/command/teleporter)
 "gvU" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -35689,6 +35674,14 @@
 	},
 /turf/open/floor/iron/dark,
 /area/engineering/main)
+"gEl" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/showroomfloor,
+/area/service/bar/atrium)
 "gEK" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -36624,14 +36617,6 @@
 "gWV" = (
 /turf/open/floor/engine/vacuum,
 /area/maintenance/disposal/incinerator)
-"gXf" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/obj/machinery/airalarm/engine{
-	pixel_y = -24
-	},
-/turf/open/floor/engine,
-/area/engineering/supermatter)
 "gXy" = (
 /obj/machinery/door/window/brigdoor/westright{
 	dir = 4;
@@ -37054,6 +37039,23 @@
 /obj/structure/cable,
 /turf/open/floor/iron/showroomfloor,
 /area/security/prison)
+"hdT" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/structure/rack,
+/obj/item/stack/sheet/iron/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/wrench,
+/obj/item/crowbar/red,
+/obj/machinery/camera{
+	c_tag = "Bar Storage";
+	dir = 5;
+	name = "bar camera"
+	},
+/turf/open/floor/iron/dark,
+/area/service/bar)
 "hdX" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/rack,
@@ -37143,13 +37145,6 @@
 /obj/machinery/navbeacon/wayfinding,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/command/nuke_storage)
-"hfP" = (
-/obj/structure/water_source/puddle,
-/obj/structure/flora/ausbushes/reedbush{
-	pixel_y = 5
-	},
-/turf/open/floor/grass,
-/area/medical/virology)
 "hgh" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -37449,23 +37444,6 @@
 	},
 /turf/open/floor/engine/vacuum,
 /area/maintenance/disposal/incinerator)
-"hmm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/cargo/storage)
 "hms" = (
 /obj/structure/flora/rock,
 /turf/open/floor/plating/asteroid/airless,
@@ -38440,6 +38418,20 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/maintenance/starboard)
+"hJc" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/command/gateway)
 "hJd" = (
 /obj/structure/closet/secure_closet/medical3,
 /obj/item/storage/belt/medical,
@@ -38472,6 +38464,14 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/maintenance/starboard/aft)
+"hJF" = (
+/obj/structure/closet/secure_closet/detective,
+/obj/structure/reagent_dispensers/peppertank/directional/north,
+/obj/structure/cable,
+/obj/item/book/manual/wiki/detective,
+/obj/machinery/power/apc/auto_name/directional/west,
+/turf/open/floor/wood,
+/area/security/detectives_office)
 "hJN" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/effect/turf_decal/stripes/corner{
@@ -38497,11 +38497,6 @@
 	},
 /turf/open/floor/iron,
 /area/cargo/storage)
-"hJR" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/holopad,
-/turf/open/floor/iron,
-/area/command/teleporter)
 "hJZ" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -38545,6 +38540,24 @@
 	},
 /turf/open/floor/iron/dark,
 /area/engineering/atmos)
+"hKy" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/item/clipboard,
+/obj/item/clothing/accessory/armband/deputy,
+/obj/item/clothing/accessory/armband/deputy,
+/obj/item/clothing/accessory/armband/deputy,
+/obj/item/clothing/accessory/armband/deputy,
+/obj/item/clothing/accessory/armband/deputy,
+/obj/item/food/donut/plain,
+/obj/item/inspector,
+/turf/open/floor/iron/dark,
+/area/security/office)
 "hKF" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/blood/old,
@@ -38764,6 +38777,21 @@
 "hOw" = (
 /turf/closed/wall,
 /area/security/office)
+"hOB" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/reagent_dispensers/peppertank/directional/west,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/security/office)
 "hOZ" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -39936,16 +39964,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/engineering/atmos)
-"inp" = (
-/obj/machinery/ai_slipper{
-	uses = 10
-	},
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/ai_monitored/turret_protected/aisat/foyer)
 "ins" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
@@ -40199,6 +40217,21 @@
 /obj/structure/table,
 /turf/open/floor/iron/cafeteria,
 /area/security/prison)
+"irV" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 1
+	},
+/obj/machinery/computer/cargo/request,
+/turf/open/floor/iron,
+/area/hallway/primary/starboard)
 "isi" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/turf_decal/stripes/line{
@@ -40797,14 +40830,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/medical/paramedic)
-"iDx" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/computer/security/telescreen/entertainment/directional/south,
-/obj/structure/reagent_dispensers/peppertank/directional/east,
-/turf/open/floor/iron/dark,
-/area/command/heads_quarters/hos)
 "iDD" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -42376,6 +42401,26 @@
 /obj/machinery/status_display/evac/directional/west,
 /turf/open/floor/iron/dark,
 /area/service/chapel/office)
+"iZX" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/item/crowbar/red,
+/obj/item/wrench,
+/obj/item/electropack,
+/obj/item/assembly/signaler{
+	pixel_x = 6
+	},
+/obj/effect/turf_decal/bot,
+/obj/structure/reagent_dispensers/peppertank/directional/east,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/iron/dark,
+/area/security/execution/education)
 "iZY" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42793,21 +42838,6 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
-"jif" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/reagent_dispensers/peppertank/directional/west,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/security/office)
 "jin" = (
 /obj/machinery/light/small/directional/west,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -42942,6 +42972,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/showroomfloor,
 /area/science/xenobiology)
+"jkY" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/holopad,
+/turf/open/floor/iron,
+/area/ai_monitored/command/storage/eva)
 "jlg" = (
 /obj/structure/displaycase/trophy,
 /obj/structure/window/reinforced{
@@ -43992,13 +44027,6 @@
 /obj/effect/spawner/random/decoration/carpet,
 /turf/open/floor/iron,
 /area/security/prison)
-"jHF" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/item/beacon,
-/turf/open/floor/engine,
-/area/ai_monitored/turret_protected/aisat/foyer)
 "jHI" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -44026,6 +44054,35 @@
 /obj/structure/sign/warning/electricshock,
 /turf/closed/wall/r_wall,
 /area/maintenance/port/aft)
+"jIx" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/radio{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/item/pen,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/structure/reagent_dispensers/peppertank/directional/south,
+/obj/machinery/camera/directional/east{
+	c_tag = "Science Security Post";
+	name = "science camera";
+	network = list("ss13","rd")
+	},
+/obj/machinery/button/door/directional/south{
+	id = "Biohazard";
+	name = "Emergency Research Lockdown";
+	pixel_x = 24;
+	req_access_txt = "47"
+	},
+/turf/open/floor/iron/dark,
+/area/security/checkpoint/science/research)
 "jJh" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/grunge{
@@ -44103,24 +44160,6 @@
 	},
 /turf/open/floor/iron,
 /area/engineering/atmos)
-"jKa" = (
-/obj/structure/table,
-/obj/machinery/recharger,
-/obj/machinery/light_switch/directional/south{
-	pixel_x = 10
-	},
-/obj/structure/reagent_dispensers/peppertank/directional/west,
-/obj/item/screwdriver,
-/obj/machinery/firealarm/directional/south{
-	pixel_x = -3
-	},
-/obj/machinery/camera/directional/south{
-	c_tag = "Cargo Checkpoint Post";
-	name = "cargo camera";
-	network = list("ss13","qm")
-	},
-/turf/open/floor/iron/dark,
-/area/security/checkpoint/supply)
 "jKf" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -46298,6 +46337,24 @@
 /obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/iron/dark,
 /area/engineering/main)
+"kwO" = (
+/obj/structure/table/glass,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/storage/box/monkeycubes,
+/obj/item/reagent_containers/syringe/antiviral,
+/obj/item/reagent_containers/dropper,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/virusfood/directional/south,
+/turf/open/floor/iron/dark,
+/area/medical/virology)
 "kwT" = (
 /obj/machinery/door/airlock/external{
 	name = "Atmospherics External Airlock";
@@ -46310,27 +46367,6 @@
 	icon_state = "panelscorched"
 	},
 /area/engineering/atmos)
-"kwV" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/machinery/microwave{
-	pixel_y = 5
-	},
-/obj/machinery/light/directional/north,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/light_switch/directional/north{
-	pixel_x = 8
-	},
-/obj/machinery/button/door/directional/north{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/service/kitchen)
 "kxi" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -47557,22 +47593,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/showroomfloor,
 /area/medical/pharmacy)
-"kTD" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/item/beacon,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/engineering/atmos)
 "kTU" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -53143,24 +53163,6 @@
 	},
 /turf/open/floor/iron/showroomfloor,
 /area/security/prison)
-"mQi" = (
-/obj/structure/table/glass,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/storage/box/monkeycubes,
-/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/dropper,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/virusfood/directional/south,
-/turf/open/floor/iron/dark,
-/area/medical/virology)
 "mQv" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12"
@@ -53714,6 +53716,24 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/engine,
 /area/engineering/supermatter/room)
+"nbe" = (
+/obj/structure/table,
+/obj/machinery/recharger,
+/obj/machinery/light_switch/directional/south{
+	pixel_x = 10
+	},
+/obj/structure/reagent_dispensers/peppertank/directional/west,
+/obj/item/screwdriver,
+/obj/machinery/firealarm/directional/south{
+	pixel_x = -3
+	},
+/obj/machinery/camera/directional/south{
+	c_tag = "Cargo Checkpoint Post";
+	name = "cargo camera";
+	network = list("ss13","qm")
+	},
+/turf/open/floor/iron/dark,
+/area/security/checkpoint/supply)
 "nbo" = (
 /obj/machinery/suit_storage_unit/atmos,
 /obj/effect/turf_decal/tile/neutral,
@@ -54856,6 +54876,27 @@
 	icon_state = "platingdmg1"
 	},
 /area/maintenance/port)
+"nBJ" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/obj/machinery/light/directional/north,
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light_switch/directional/north{
+	pixel_x = 8
+	},
+/obj/machinery/button/door/directional/north{
+	pixel_x = -8
+	},
+/turf/open/floor/iron/dark,
+/area/service/kitchen)
 "nCo" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12"
@@ -55232,6 +55273,16 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating,
 /area/cargo/warehouse)
+"nKW" = (
+/obj/machinery/vending/wardrobe/sec_wardrobe,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/bot,
+/obj/structure/reagent_dispensers/peppertank/directional/west,
+/turf/open/floor/iron/dark,
+/area/security/brig)
 "nLl" = (
 /obj/structure/reflector/single/anchored{
 	dir = 5
@@ -56249,27 +56300,6 @@
 /obj/structure/sign/warning/docking,
 /turf/closed/wall,
 /area/cargo/storage)
-"ofZ" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
-/obj/item/beacon,
-/turf/open/floor/iron,
-/area/hallway/primary/fore)
 "ogc" = (
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
@@ -56332,12 +56362,6 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/starboard)
-"ohb" = (
-/obj/effect/turf_decal/siding/purple{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/science/robotics/mechbay)
 "ohr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/east,
@@ -59112,6 +59136,10 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/starboard/aft)
+"pfL" = (
+/mob/living/simple_animal/butterfly,
+/turf/open/floor/grass,
+/area/service/chapel)
 "pfM" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/chair/office{
@@ -59606,6 +59634,23 @@
 	icon_state = "platingdmg1"
 	},
 /area/engineering/supermatter/room)
+"poL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/cargo/storage)
 "poN" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -60965,6 +61010,20 @@
 /obj/item/clothing/mask/gas,
 /turf/open/floor/iron/dark,
 /area/maintenance/disposal/incinerator)
+"pLY" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron/dark,
+/area/commons/fitness/recreation)
 "pMi" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -63918,20 +63977,6 @@
 /obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/iron/dark,
 /area/science/research)
-"qRp" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron/dark,
-/area/commons/fitness/recreation)
 "qRs" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/conveyor{
@@ -64129,16 +64174,6 @@
 	icon_state = "panelscorched"
 	},
 /area/maintenance/central)
-"qVL" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/item/beacon,
-/turf/open/floor/iron,
-/area/security/courtroom)
 "qVM" = (
 /obj/structure/lattice,
 /obj/structure/girder/reinforced,
@@ -65271,6 +65306,11 @@
 	},
 /turf/open/floor/iron/dark,
 /area/engineering/atmos)
+"rmY" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/holopad,
+/turf/open/floor/iron,
+/area/command/teleporter)
 "rnf" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -65478,14 +65518,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/science/xenobiology)
-"rqs" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/showroomfloor,
-/area/service/bar/atrium)
 "rqT" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -66760,22 +66792,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/service/library)
-"rMC" = (
-/obj/structure/closet/secure_closet/security/engine,
-/obj/effect/turf_decal/delivery,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/machinery/light/directional/south,
-/obj/structure/reagent_dispensers/peppertank/directional/south,
-/obj/item/crowbar,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/security/checkpoint/engineering)
 "rMG" = (
 /turf/closed/wall/rust,
 /area/command/heads_quarters/hos)
@@ -67688,6 +67704,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/maintenance/fore)
+"sdR" = (
+/obj/item/beacon,
+/turf/open/floor/iron/dark,
+/area/command/bridge)
 "sdZ" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
@@ -69563,6 +69583,13 @@
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible,
 /turf/open/floor/plating,
 /area/engineering/atmos)
+"sOO" = (
+/obj/structure/water_source/puddle,
+/obj/structure/flora/ausbushes/reedbush{
+	pixel_y = 5
+	},
+/turf/open/floor/grass,
+/area/medical/virology)
 "sPa" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -69728,6 +69755,14 @@
 /obj/effect/turf_decal/caution/stand_clear,
 /turf/open/floor/iron/dark,
 /area/command/bridge)
+"sSi" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/computer/security/telescreen/entertainment/directional/south,
+/obj/structure/reagent_dispensers/peppertank/directional/east,
+/turf/open/floor/iron/dark,
+/area/command/heads_quarters/hos)
 "sSm" = (
 /obj/machinery/atmospherics/components/binary/thermomachine/freezer/on,
 /obj/effect/turf_decal/delivery,
@@ -70098,21 +70133,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/security/prison)
-"tbX" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/item/beacon,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/hallway/primary/aft)
 "tcq" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/decal/cleanable/dirt,
@@ -72880,10 +72900,6 @@
 	},
 /turf/open/floor/iron/showroomfloor,
 /area/science/research)
-"ubH" = (
-/mob/living/simple_animal/butterfly,
-/turf/open/floor/grass,
-/area/service/chapel)
 "ucc" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
@@ -73192,6 +73208,21 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/hallway/secondary/exit/departure_lounge)
+"uik" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/table,
+/obj/machinery/computer/security/telescreen{
+	desc = "Used for monitoring medbay to ensure patient safety.";
+	dir = 1;
+	name = "Medbay Monitor";
+	network = list("medical")
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/peppertank/directional/south,
+/turf/open/floor/iron/dark,
+/area/security/checkpoint/medical)
 "uiI" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet/l3closet/virology,
@@ -74043,14 +74074,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/service/library)
-"uBo" = (
-/obj/machinery/camera/directional/north{
-	c_tag = "Xenobiology Test Chamber";
-	name = "xenobiology camera";
-	network = list("ss13","rd","xeno")
-	},
-/turf/open/floor/engine,
-/area/science/xenobiology)
 "uBG" = (
 /obj/machinery/disposal/bin,
 /obj/effect/turf_decal/bot,
@@ -74389,6 +74412,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/cargo/sorting)
+"uHN" = (
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/yellow/corner{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/engineering/main)
 "uHR" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -75090,6 +75125,29 @@
 	icon_state = "wood-broken6"
 	},
 /area/maintenance/port)
+"vaP" = (
+/obj/item/storage/box/chemimp{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/storage/box/trackimp{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/obj/structure/reagent_dispensers/peppertank/directional/south,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/box/firingpins,
+/obj/item/storage/lockbox/loyalty,
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "vaU" = (
 /obj/structure/sign/warning/electricshock,
 /turf/closed/wall/rust,
@@ -76446,14 +76504,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/security/checkpoint/customs)
-"vAo" = (
-/obj/structure/closet/secure_closet/detective,
-/obj/structure/reagent_dispensers/peppertank/directional/north,
-/obj/structure/cable,
-/obj/item/book/manual/wiki/detective,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/wood,
-/area/security/detectives_office)
 "vAx" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -77717,18 +77767,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/engineering/atmos)
-"wat" = (
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/yellow/corner{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/engineering/main)
 "waA" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public/glass{
@@ -77771,23 +77809,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/cargo/storage)
-"wbo" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/structure/rack,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/wrench,
-/obj/item/crowbar/red,
-/obj/machinery/camera{
-	c_tag = "Bar Storage";
-	dir = 5;
-	name = "bar camera"
-	},
-/turf/open/floor/iron/dark,
-/area/service/bar)
 "wbC" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -80092,21 +80113,6 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /turf/open/floor/iron,
 /area/command/bridge)
-"wRi" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/table,
-/obj/machinery/computer/security/telescreen{
-	desc = "Used for monitoring medbay to ensure patient safety.";
-	dir = 1;
-	name = "Medbay Monitor";
-	network = list("medical")
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/structure/reagent_dispensers/peppertank/directional/south,
-/turf/open/floor/iron/dark,
-/area/security/checkpoint/medical)
 "wRj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/item/tank/internals/oxygen/empty,
@@ -81004,16 +81010,6 @@
 /obj/effect/turf_decal/siding/blue,
 /turf/open/floor/iron/showroomfloor,
 /area/medical/storage)
-"xiR" = (
-/obj/machinery/vending/wardrobe/sec_wardrobe,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/peppertank/directional/west,
-/turf/open/floor/iron/dark,
-/area/security/brig)
 "xiX" = (
 /obj/structure/flora/grass/jungle/b,
 /obj/structure/flora/ausbushes/grassybush,
@@ -83603,6 +83599,14 @@
 /obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
 /turf/open/floor/plating,
 /area/maintenance/port)
+"ydl" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
+/obj/machinery/airalarm/engine{
+	pixel_y = -24
+	},
+/turf/open/floor/engine,
+/area/engineering/supermatter)
 "ydo" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
@@ -83782,10 +83786,6 @@
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
-"yha" = (
-/obj/item/beacon,
-/turf/open/floor/engine,
-/area/science/xenobiology)
 "yhd" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -100275,7 +100275,7 @@ gFq
 cSU
 ocN
 sdw
-cgW
+iZX
 ajx
 ajx
 ajx
@@ -101306,7 +101306,7 @@ bsD
 cIA
 ajd
 qPK
-jif
+hOB
 gHG
 kfE
 euG
@@ -101541,7 +101541,7 @@ hcO
 ubi
 jan
 ybW
-qRp
+pLY
 tYO
 mTI
 tMM
@@ -102850,7 +102850,7 @@ hOw
 ilG
 wzc
 sIP
-cEu
+hKy
 iuQ
 dGL
 goJ
@@ -104128,7 +104128,7 @@ ani
 jrA
 aeg
 fzg
-dzz
+fgr
 cBn
 dsp
 aei
@@ -104402,7 +104402,7 @@ xvm
 whc
 nhS
 mWF
-iDx
+sSi
 dUp
 aeu
 aeU
@@ -104862,7 +104862,7 @@ hEa
 aTO
 eFD
 jbR
-wRi
+uik
 wHX
 aQV
 uzc
@@ -105173,7 +105173,7 @@ cHL
 cbp
 alQ
 amr
-gjK
+vaP
 amX
 aeu
 aeu
@@ -105391,7 +105391,7 @@ jtZ
 ivI
 biF
 bwO
-mQi
+kwO
 afe
 xbU
 bhQ
@@ -106415,7 +106415,7 @@ bhT
 aUJ
 aTh
 aTi
-hfP
+sOO
 cVO
 icM
 nmo
@@ -106710,7 +106710,7 @@ sTS
 cdR
 kuz
 bCD
-xiR
+nKW
 oYL
 bGc
 ceY
@@ -108241,7 +108241,7 @@ bZh
 ajd
 bpl
 bBr
-cHM
+cdj
 bEA
 bEG
 bEA
@@ -109266,7 +109266,7 @@ ajd
 aer
 bNF
 ajd
-vAo
+hJF
 jfJ
 rRF
 jfJ
@@ -109991,7 +109991,7 @@ gps
 adH
 mOB
 eWZ
-ubH
+pfL
 fLj
 xQq
 vKw
@@ -110523,7 +110523,7 @@ qHG
 lrG
 uwD
 igH
-wbo
+hdT
 mYk
 vqW
 wAO
@@ -110797,7 +110797,7 @@ auI
 atf
 auK
 fii
-qVL
+ccR
 iUr
 api
 auP
@@ -112052,7 +112052,7 @@ pDF
 jQW
 qXc
 qPH
-ofZ
+aIs
 aIc
 aKK
 lBj
@@ -112789,7 +112789,7 @@ mIX
 aKI
 xmx
 adI
-inp
+adW
 mld
 aed
 jsj
@@ -113047,7 +113047,7 @@ wSY
 chX
 msW
 cij
-jHF
+ahz
 cio
 lJg
 ciy
@@ -113915,7 +113915,7 @@ enE
 eVu
 tIK
 iqM
-kTD
+eaV
 snK
 oYG
 iNb
@@ -114127,7 +114127,7 @@ axf
 tPZ
 gJh
 lhH
-gjp
+sdR
 lCl
 fPq
 qQu
@@ -115178,7 +115178,7 @@ cby
 kTq
 eMc
 rFc
-aKB
+jkY
 toZ
 bSi
 cks
@@ -115425,7 +115425,7 @@ dbG
 rIt
 oth
 keV
-hJR
+rmY
 rFe
 qtb
 jKf
@@ -115681,7 +115681,7 @@ tEb
 tEb
 lih
 dSj
-gvO
+fnj
 wgL
 lEK
 vtw
@@ -115905,7 +115905,7 @@ baH
 vmf
 sRM
 mJM
-gcU
+hJc
 lQl
 vdJ
 wmA
@@ -117251,7 +117251,7 @@ ctN
 ozA
 cwM
 cyf
-rMC
+fKu
 awH
 wDF
 kpr
@@ -118218,7 +118218,7 @@ baH
 eaR
 aAm
 aBC
-ohb
+aDa
 aSh
 baW
 aJb
@@ -118779,7 +118779,7 @@ tKZ
 ggd
 unY
 qdo
-tbX
+cpQ
 wOZ
 lGV
 set
@@ -118792,7 +118792,7 @@ xFU
 mpx
 utH
 mmw
-wat
+uHN
 gCq
 jrx
 wUf
@@ -119256,7 +119256,7 @@ pDn
 nLC
 vQh
 ntU
-rqs
+gEl
 epi
 vtT
 uGZ
@@ -119518,7 +119518,7 @@ eVL
 mCh
 sCu
 uuQ
-kwV
+nBJ
 eeV
 ogc
 wIJ
@@ -119567,7 +119567,7 @@ iKo
 mXB
 tRp
 gaa
-gXf
+ydl
 eux
 dGa
 lAJ
@@ -121015,7 +121015,7 @@ aeu
 aeu
 alB
 bbx
-yha
+aax
 bfs
 bwe
 mfS
@@ -121063,7 +121063,7 @@ aYd
 xaM
 bpd
 bpF
-eVT
+irV
 hij
 rOo
 bxl
@@ -121329,7 +121329,7 @@ ngH
 blf
 lsu
 bkJ
-jKa
+nbe
 blf
 mHt
 hoL
@@ -121785,7 +121785,7 @@ aeu
 aeu
 aeu
 bwe
-uBo
+dwu
 bdD
 apR
 axR
@@ -123626,7 +123626,7 @@ bcD
 eRV
 bco
 beb
-cAh
+jIx
 bkd
 bdN
 bjs
@@ -123899,7 +123899,7 @@ maF
 vAL
 lyL
 xJS
-hmm
+poL
 nnZ
 wWX
 pCD
@@ -141360,7 +141360,7 @@ cbU
 cbX
 cck
 ccx
-dvK
+ccE
 ccx
 ciz
 cGy
diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
index f4edb3aac39..1d9243ae38e 100644
--- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
+++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
@@ -76844,7 +76844,7 @@
 /obj/item/clothing/accessory/armband/deputy,
 /obj/item/clothing/accessory/armband/deputy,
 /obj/item/clothing/accessory/armband/deputy,
-/obj/item/food/donut,
+/obj/item/food/donut/plain,
 /obj/item/inspector,
 /turf/open/floor/iron/dark,
 /area/security/office)
diff --git a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm
index 1a57c3f622e..4cb16f8dd8c 100644
--- a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm
+++ b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm
@@ -78768,10 +78768,6 @@
 /obj/structure/sign/warning/securearea,
 /turf/closed/wall,
 /area/engineering/gravity_generator)
-"qTC" = (
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/security/prison)
 "qUJ" = (
 /obj/effect/turf_decal/tile/green{
 	dir = 1
@@ -86592,7 +86588,7 @@
 /obj/item/clothing/accessory/armband/deputy,
 /obj/item/clothing/accessory/armband/deputy,
 /obj/item/clothing/accessory/armband/deputy,
-/obj/item/food/donut,
+/obj/item/food/donut/plain,
 /obj/item/inspector,
 /turf/open/floor/iron/dark,
 /area/security/office)
@@ -98629,7 +98625,7 @@ aeu
 cry
 cry
 anu
-qTC
+cTl
 cuQ
 cQs
 vKK
diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm
index 10d296c468c..c9745855f0f 100644
--- a/_maps/shuttles/emergency_cruise.dmm
+++ b/_maps/shuttles/emergency_cruise.dmm
@@ -70,7 +70,7 @@
 /obj/item/storage/fancy/donut_box{
 	pixel_y = -7
 	},
-/obj/item/food/donut{
+/obj/item/food/donut/plain{
 	pixel_x = 5;
 	pixel_y = 10
 	},
diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index 3f6e20d3551..ac952956a10 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -36,7 +36,7 @@
 /datum/recipe
 	var/list/reagents_list // example:  = list(/datum/reagent/consumable/berryjuice = 5) // do not list same reagent twice
 	var/list/items // example: =list(/obj/item/crowbar, /obj/item/welder) // place /foo/bar before /foo
-	var/result //example: = /obj/item/food/donut
+	var/result //example: = /obj/item/food/donut/plain
 	var/time = 100 // 1/10 part of second
 
 
diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm
index f2b730a17f1..a5f5176dc8a 100644
--- a/code/game/objects/items/food/pastries.dm
+++ b/code/game/objects/items/food/pastries.dm
@@ -8,7 +8,6 @@
 	name = "donut"
 	desc = "Goes great with robust coffee."
 	icon = 'icons/obj/food/donuts.dmi'
-	icon_state = "donut"
 	bite_consumption = 5
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3)
 	tastes = list("donut" = 1)
@@ -61,6 +60,7 @@
 
 //Use this donut ingame
 /obj/item/food/donut/plain
+	icon_state = "donut"
 
 /obj/item/food/donut/chaos
 	name = "chaos donut"
@@ -161,7 +161,6 @@
 	name = "jelly donut"
 	desc = "You jelly?"
 	icon_state = "jelly"
-	decorated_icon = "jelly_homer"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	extra_reagent = /datum/reagent/consumable/berryjuice
 	tastes = list("jelly" = 1, "donut" = 3)
@@ -177,6 +176,7 @@
 		reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/food/donut/jelly/plain //use this ingame to avoid inheritance related crafting issues.
+	decorated_icon = "jelly_homer"
 
 /obj/item/food/donut/jelly/berry
 	name = "pink jelly donut"
@@ -254,11 +254,11 @@
 /obj/item/food/donut/jelly/slimejelly
 	name = "jelly donut"
 	desc = "You jelly?"
-	icon_state = "jelly"
 	extra_reagent = /datum/reagent/toxin/slimejelly
 	foodtypes = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR | BREAKFAST
 
 /obj/item/food/donut/jelly/slimejelly/plain
+	icon_state = "jelly"
 
 /obj/item/food/donut/jelly/slimejelly/berry
 	name = "pink jelly donut"
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 2bda29bdf2d..e68b9e26b9d 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -79,7 +79,7 @@
 	icon = 'icons/obj/food/donuts.dmi'
 	icon_state = "donutbox_inner"
 	base_icon_state = "donutbox"
-	spawn_type = /obj/item/food/donut
+	spawn_type = /obj/item/food/donut/plain
 	is_open = TRUE
 	appearance_flags = KEEP_TOGETHER
 	custom_premium_price = PAYCHECK_HARD * 1.75
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index fa7631f88b9..b61b11417b2 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -12,7 +12,7 @@
 		/obj/item/restraints/handcuffs/cable/zipties = 10,
 		/obj/item/grenade/flashbang = 4,
 		/obj/item/assembly/flash/handheld = 5,
-		/obj/item/food/donut = 12,
+		/obj/item/food/donut/plain = 12,
 		/obj/item/storage/box/evidence = 6,
 		/obj/item/flashlight/seclite = 4,
 		/obj/item/restraints/legcuffs/bola/energy = 7
diff --git a/modular_skyrat/modules/sec_haul/code/misc/vending.dm b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
index da4f8c6ea19..49f5dc1d806 100644
--- a/modular_skyrat/modules/sec_haul/code/misc/vending.dm
+++ b/modular_skyrat/modules/sec_haul/code/misc/vending.dm
@@ -12,7 +12,7 @@
 		/obj/item/restraints/handcuffs/cable/zipties = 10,
 		/obj/item/grenade/flashbang = 4,
 		/obj/item/assembly/flash/handheld = 5,
-		/obj/item/food/donut = 12,
+		/obj/item/food/donut/plain = 12,
 		/obj/item/storage/box/evidence = 6,
 		/obj/item/flashlight/seclite = 4,
 		/obj/item/restraints/legcuffs/bola/energy = 7