diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 7382b13e1a7..fdcd2b6b072 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -7336,7 +7336,7 @@
/obj/item/clothing/head/costume/cardborg,
/obj/item/clothing/head/cone,
/obj/item/clothing/head/costume/festive,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/item/clothing/head/helmet/sec,
/obj/item/clothing/head/costume/jester,
/obj/item/clothing/head/chaplain/nun_hood,
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
index 1a4fad2658c..f40ff2bf3bb 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm
@@ -1027,7 +1027,7 @@
},
/obj/item/clothing/suit/armor/riot,
/obj/item/shield/riot,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/effect/spawner/random/exotic/antag_gear,
/obj/effect/spawner/random/exotic/antag_gear_weak,
/obj/structure/closet/crate/secure/weapon{
diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
index 273497fb2e3..fd89f454495 100644
--- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
@@ -1379,14 +1379,14 @@
/obj/item/clothing/suit/armor/riot{
pixel_y = 2
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 8;
pixel_y = -8
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -6
},
/turf/open/floor/iron/smooth_large,
diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm
index da703b6795c..21123a683f0 100644
--- a/_maps/RandomZLevels/blackmesa.dmm
+++ b/_maps/RandomZLevels/blackmesa.dmm
@@ -2505,7 +2505,7 @@
"aFx" = (
/obj/structure/rack/shelf,
/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/item/shield/riot,
/turf/open/floor/iron,
/area/awaymission/black_mesa/security_outpost)
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index b603558a32d..c0835b89ba2 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -3895,7 +3895,7 @@
"AY" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/tile/red/fourcorners,
/turf/open/floor/iron,
diff --git a/_maps/RandomZLevels/research2.dmm b/_maps/RandomZLevels/research2.dmm
index ea4ad2095a2..fbb4431f345 100644
--- a/_maps/RandomZLevels/research2.dmm
+++ b/_maps/RandomZLevels/research2.dmm
@@ -968,7 +968,7 @@
"dG" = (
/obj/structure/rack,
/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/tile/red{
dir = 1
diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm
index 40a16aa8d16..eb6b945eccf 100644
--- a/_maps/map_files/Blueshift/BlueShift_middle.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm
@@ -26246,27 +26246,27 @@
"ikF" = (
/obj/structure/rack,
/obj/effect/turf_decal/delivery,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6;
pixel_y = 5
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -5;
pixel_y = 1
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6;
pixel_y = 1
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -5;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6;
pixel_y = -3
},
@@ -37094,7 +37094,7 @@
/obj/effect/turf_decal/bot,
/obj/structure/closet/athletic_mixed,
/obj/item/clothing/head/costume/sombrero,
-/obj/item/clothing/head/helmet/justice,
+/obj/item/clothing/head/helmet/toggleable/justice,
/obj/item/clothing/head/costume/rice_hat,
/obj/item/clothing/mask/joy,
/obj/item/clothing/mask/luchador/tecnicos,
diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm
index c9bfb77012f..5516e5d2b18 100644
--- a/_maps/map_files/Blueshift/BlueShift_upper.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm
@@ -1673,7 +1673,7 @@
/obj/structure/rack/shelf,
/obj/effect/turf_decal/delivery/red,
/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 6
},
/turf/open/floor/iron/dark,
@@ -55772,7 +55772,7 @@
/obj/item/ammo_box/magazine/toy/pistol/riot,
/obj/item/gun/ballistic/automatic/pistol/toy/riot,
/obj/item/melee/baton,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ae05b7a8a15..03fe083aa0e 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -40,17 +40,6 @@
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron/dark,
/area/station/service/theater)
-"aaC" = (
-/obj/structure/table/wood,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/light/small/directional/east,
-/obj/item/clothing/suit/costume/justice,
-/obj/item/clothing/head/helmet/justice/escape{
- name = "justice helmet"
- },
-/turf/open/floor/iron/dark,
-/area/station/service/theater/abandoned)
"aaM" = (
/turf/closed/wall,
/area/station/medical/surgery/theatre)
@@ -685,12 +674,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
-"agJ" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"agZ" = (
/obj/machinery/ntnet_relay,
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -1527,6 +1510,15 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/iron/white,
/area/station/medical/paramedic)
+"aqS" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"aqW" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -1980,14 +1972,6 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
-"auI" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"auJ" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -3966,6 +3950,15 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"aVh" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/evidence)
"aVo" = (
/obj/machinery/computer/security/hos{
dir = 1
@@ -4114,12 +4107,6 @@
},
/turf/open/floor/plating,
/area/station/cargo/storage)
-"aWO" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/suit_storage_unit/security,
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"aWP" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4239,6 +4226,27 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
+"aYl" = (
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Morgue"
+ },
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/medical/morgue)
"aYs" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 9
@@ -4303,6 +4311,16 @@
/obj/effect/spawner/structure/window/reinforced/plasma,
/turf/open/floor/plating,
/area/station/engineering/main)
+"aZf" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"aZp" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -10465,6 +10483,14 @@
/obj/machinery/light/small/directional/west,
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
+"csV" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/machinery/camera/directional/south{
+ c_tag = "Security - Evidence Storage"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"csY" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/box/white/corners{
@@ -10778,6 +10804,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/supermatter/room)
+"cxq" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"cxs" = (
/obj/structure/rack,
/obj/effect/spawner/random/techstorage/engineering_all,
@@ -12093,6 +12125,23 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/science/xenobiology)
+"cOy" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Evidence Storage"
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/security/evidence)
"cOA" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -12382,6 +12431,19 @@
"cRT" = (
/turf/open/floor/iron,
/area/station/medical/abandoned)
+"cRV" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/evidence)
"cRW" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -13004,13 +13066,6 @@
},
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
-"dav" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/tank_dispenser/oxygen,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"dax" = (
/obj/structure/window,
/obj/structure/sink/directional/south,
@@ -13182,6 +13237,13 @@
/obj/machinery/status_display/ai/directional/south,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"dcM" = (
+/obj/structure/closet{
+ name = "Evidence Closet"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"dcR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
@@ -14522,19 +14584,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
-"dur" = (
-/obj/structure/table/reinforced,
-/obj/item/bodypart/chest/robot,
-/obj/item/bodypart/r_arm/robot{
- pixel_x = 6
- },
-/obj/item/bodypart/l_arm/robot{
- pixel_x = -6
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/status_display/evac/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai)
"dux" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -15344,16 +15393,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/atmos/hfr_room)
-"dEZ" = (
-/obj/effect/turf_decal/trimline/dark_red/filled/warning{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"dFg" = (
/turf/open/floor/iron/chapel{
dir = 9
@@ -19094,6 +19133,45 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
+"eCO" = (
+/obj/item/stack/cable_coil,
+/obj/item/bodypart/r_arm/robot{
+ pixel_x = 3
+ },
+/obj/item/bodypart/l_arm/robot{
+ pixel_x = -3
+ },
+/obj/structure/table,
+/obj/item/radio/intercom/directional/west,
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/prox_sensor{
+ pixel_x = 5
+ },
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/machinery/light/directional/west,
+/obj/item/stock_parts/cell/high{
+ pixel_x = 3;
+ pixel_y = 16
+ },
+/obj/item/stock_parts/cell/high{
+ pixel_x = -3;
+ pixel_y = 16
+ },
+/obj/item/stock_parts/cell/high{
+ pixel_y = 15
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"eCR" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -21660,15 +21738,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/station/service/library/abandoned)
-"fhC" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/item/bedsheet/dorms{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"fhE" = (
/obj/machinery/door/airlock/public/glass{
name = "Holodeck Access"
@@ -22095,6 +22164,14 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
+"fnx" = (
+/obj/effect/landmark/secequipment,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"fnA" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
@@ -22298,17 +22375,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
-"fqs" = (
-/obj/effect/turf_decal/trimline/dark_red/filled/warning{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"fqx" = (
/obj/effect/landmark/start/hangover/closet,
/obj/structure/closet/crate,
@@ -23203,6 +23269,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/service/theater/abandoned)
+"fBM" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"fBP" = (
/obj/structure/chair{
dir = 8
@@ -23602,46 +23676,6 @@
},
/turf/open/floor/engine/n2,
/area/station/engineering/atmos)
-"fHN" = (
-/obj/machinery/button/door/directional/south{
- id = "psych_shutters";
- name = "Shutter Control";
- pixel_x = -4;
- req_access = list("psychology")
- },
-/obj/machinery/light_switch/directional/south{
- pixel_x = 6
- },
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/button/door/directional/south{
- id = "psych_bolt";
- name = "Bolt Control";
- normaldoorcontrol = 1;
- pixel_x = -4;
- pixel_y = -35;
- req_access = list("psychology");
- specialfunctions = 4
- },
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop{
- dir = 1;
- pixel_y = 4
- },
-/turf/open/floor/wood,
-/area/station/medical/psychology)
-"fHX" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_red/filled/warning{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/security/evidence)
"fIg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -26482,14 +26516,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/brig)
-"grb" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/blue,
-/obj/item/bodypart/l_leg/robot,
-/obj/item/bodypart/r_leg/robot,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai)
"gri" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -26995,6 +27021,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"gwC" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/tank_dispenser/oxygen,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"gwE" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -27763,6 +27796,13 @@
/obj/item/storage/secure/briefcase,
/turf/open/floor/wood,
/area/station/command/meeting_room/council)
+"gGl" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/closet/secure_closet/evidence,
+/obj/item/radio/intercom/directional/south,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"gGv" = (
/obj/effect/turf_decal/tile/red,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -32080,14 +32120,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/commons/toilet/locker)
-"hNy" = (
-/obj/effect/landmark/secequipment,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"hNP" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -33314,12 +33346,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/station/commons/toilet/locker)
-"ibR" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/machinery/status_display/evac/directional/east,
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"ibS" = (
/obj/structure/dresser,
/obj/effect/decal/cleanable/dirt/dust,
@@ -33986,14 +34012,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron,
/area/station/maintenance/port/aft)
-"iju" = (
-/obj/structure/closet{
- name = "Evidence Closet"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"ijx" = (
/turf/open/floor/iron/white/side,
/area/station/science/lobby)
@@ -37835,18 +37853,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"jgH" = (
-/obj/structure/sign/poster/official/help_others{
- pixel_x = 32
- },
-/obj/machinery/light/warm/directional/south,
-/obj/structure/closet/secure_closet/psychology,
-/obj/item/toy/plush/beeplushie{
- desc = "Maybe hugging this will make you feel better about yourself.";
- name = "Therabee"
- },
-/turf/open/floor/wood,
-/area/station/medical/psychology)
"jgN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -39342,14 +39348,6 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/iron,
/area/station/medical/virology)
-"jyV" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/security/evidence)
"jzb" = (
/obj/machinery/door/poddoor/shutters{
dir = 4;
@@ -40122,6 +40120,17 @@
/obj/effect/turf_decal/trimline/yellow/filled/line,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"jGJ" = (
+/obj/structure/table/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/light/small/directional/east,
+/obj/item/clothing/suit/costume/justice,
+/obj/item/clothing/head/helmet/toggleable/justice/escape{
+ name = "justice helmet"
+ },
+/turf/open/floor/iron/dark,
+/area/station/service/theater/abandoned)
"jHb" = (
/turf/open/floor/iron/grimy,
/area/station/tcommsat/computer)
@@ -40432,22 +40441,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"jLm" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Security E.V.A. Storage"
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/armory,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/security/evidence)
"jLo" = (
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
@@ -40678,11 +40671,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
-"jNM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/evidence)
"jNP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/holopad,
@@ -41781,6 +41769,24 @@
/obj/effect/spawner/random/trash/grille_or_waste,
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"kaZ" = (
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/obj/structure/table/wood,
+/obj/item/folder/white{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/item/paper_bin/carbon{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/pen,
+/obj/item/flashlight/lamp/green{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/station/medical/psychology)
"kba" = (
/obj/machinery/button/door/directional/west{
id = "Dorm1";
@@ -42489,15 +42495,6 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"kiG" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/closet{
- name = "Evidence Closet"
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kiQ" = (
/obj/structure/closet/radiation,
/obj/effect/turf_decal/bot,
@@ -44053,6 +44050,13 @@
/obj/effect/landmark/start/botanist,
/turf/open/floor/iron/dark/smooth_large,
/area/station/service/hydroponics)
+"kEa" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"kEg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45857,6 +45861,19 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
+"lbz" = (
+/obj/structure/table/reinforced,
+/obj/item/bodypart/chest/robot,
+/obj/item/bodypart/r_arm/robot{
+ pixel_x = 6
+ },
+/obj/item/bodypart/l_arm/robot{
+ pixel_x = -6
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/status_display/evac/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai)
"lbF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48296,6 +48313,14 @@
},
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"lGW" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/neutral/full,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/evidence)
"lHb" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -51150,13 +51175,6 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
-"mub" = (
-/obj/structure/closet/bombcloset/security,
-/obj/effect/turf_decal/trimline/dark_red/filled/line{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"muh" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/cable_coil,
@@ -51496,6 +51514,33 @@
dir = 5
},
/area/station/service/chapel)
+"mym" = (
+/obj/machinery/button/door/directional/south{
+ id = "psych_shutters";
+ name = "Shutter Control";
+ pixel_x = -4;
+ req_access = list("psychology")
+ },
+/obj/machinery/light_switch/directional/south{
+ pixel_x = 6
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/button/door/directional/south{
+ id = "psych_bolt";
+ name = "Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = -4;
+ pixel_y = -35;
+ req_access = list("psychology");
+ specialfunctions = 4
+ },
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop{
+ dir = 1;
+ pixel_y = 4
+ },
+/turf/open/floor/wood,
+/area/station/medical/psychology)
"myx" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
@@ -55311,45 +55356,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
-"nvN" = (
-/obj/item/stack/cable_coil,
-/obj/item/bodypart/r_arm/robot{
- pixel_x = 3
- },
-/obj/item/bodypart/l_arm/robot{
- pixel_x = -3
- },
-/obj/structure/table,
-/obj/item/radio/intercom/directional/west,
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = 5
- },
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/item/assembly/flash/handheld,
-/obj/machinery/light/directional/west,
-/obj/item/stock_parts/cell/high{
- pixel_x = 3;
- pixel_y = 16
- },
-/obj/item/stock_parts/cell/high{
- pixel_x = -3;
- pixel_y = 16
- },
-/obj/item/stock_parts/cell/high{
- pixel_y = 15
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"nvO" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 1
@@ -56625,6 +56631,13 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/plating,
/area/station/security/execution/transfer)
+"nKe" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"nKA" = (
/obj/effect/spawner/structure/window,
/obj/machinery/door/poddoor/preopen{
@@ -57165,14 +57178,6 @@
},
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
-"nRh" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_red/filled/warning{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"nRi" = (
/obj/structure/sign/warning/secure_area/directional/south,
/obj/structure/table,
@@ -57760,24 +57765,6 @@
"nZi" = (
/turf/closed/wall,
/area/station/service/library/private)
-"nZj" = (
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/obj/structure/table/wood,
-/obj/item/folder/white{
- pixel_x = -2;
- pixel_y = 3
- },
-/obj/item/paper_bin/carbon{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/pen,
-/obj/item/flashlight/lamp/green{
- pixel_x = 9;
- pixel_y = 5
- },
-/turf/open/floor/wood,
-/area/station/medical/psychology)
"nZk" = (
/turf/open/floor/iron/dark/side{
dir = 4
@@ -58228,6 +58215,14 @@
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
+"ofb" = (
+/obj/structure/table,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"ofg" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -58425,23 +58420,6 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"ohI" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- name = "Evidence Storage"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/evidence)
"ohP" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=hall11";
@@ -60393,13 +60371,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"oJW" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/closet/secure_closet/evidence,
-/obj/item/radio/intercom/directional/south,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"oKr" = (
/turf/closed/wall,
/area/station/security/checkpoint/supply)
@@ -60482,6 +60453,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/maintenance/department/science)
+"oLO" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"oLT" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -61626,6 +61603,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/service/library)
+"pbT" = (
+/obj/structure/closet/bombcloset/security,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"pbU" = (
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
@@ -65382,6 +65366,16 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron,
/area/station/security/lockers)
+"pUm" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/dorms{
+ dir = 1
+ },
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"pUp" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/obj/effect/turf_decal/tile/yellow{
@@ -66446,6 +66440,15 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics/garden)
+"qgY" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/closet{
+ name = "Evidence Closet"
+ },
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"qhb" = (
/obj/structure/window/reinforced{
dir = 4
@@ -67771,13 +67774,6 @@
/obj/effect/spawner/random/engineering/atmospherics_portable,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"qzk" = (
-/obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
-/obj/machinery/status_display/evac/directional/east,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"qzn" = (
/obj/effect/turf_decal/siding/wood{
dir = 10
@@ -68770,15 +68766,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"qKX" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/security/evidence)
"qKY" = (
/obj/structure/table/wood,
/obj/item/folder/yellow,
@@ -69461,6 +69448,14 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
+"qTe" = (
+/obj/structure/closet{
+ name = "Evidence Closet"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"qTs" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70764,13 +70759,6 @@
},
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
-"rlU" = (
-/obj/structure/closet/l3closet/security,
-/obj/effect/turf_decal/trimline/dark_red/filled/line{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"rme" = (
/obj/structure/table/wood,
/obj/item/phone{
@@ -71688,14 +71676,6 @@
/obj/effect/turf_decal/tile/red/half/contrasted,
/turf/open/floor/iron,
/area/station/security/holding_cell)
-"ryB" = (
-/obj/structure/closet{
- name = "Evidence Closet"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"ryC" = (
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/line{
@@ -77298,9 +77278,6 @@
/obj/structure/sign/warning/no_smoking/directional/west,
/turf/open/floor/iron/dark/textured_half,
/area/station/science/robotics/lab)
-"sRd" = (
-/turf/closed/wall/r_wall,
-/area/station/security/evidence)
"sRm" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/window/reinforced/spawner/west,
@@ -79407,6 +79384,17 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"ttg" = (
+/obj/effect/turf_decal/trimline/dark_red/filled/warning{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"tti" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -79660,27 +79648,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/bar)
-"twq" = (
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/door/airlock/grunge{
- name = "Morgue"
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/medical/morgue)
"twv" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/newscaster/directional/east,
@@ -81512,6 +81479,14 @@
},
/turf/open/floor/iron,
/area/station/cargo/lobby)
+"tTe" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/blue,
+/obj/item/bodypart/l_leg/robot,
+/obj/item/bodypart/r_leg/robot,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/turret_protected/ai)
"tTf" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -84430,6 +84405,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/station/service/abandoned_gambling_den)
+"uEo" = (
+/obj/structure/bed/double,
+/obj/item/bedsheet/dorms_double,
+/obj/machinery/status_display/evac/directional/east,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"uEv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/engineering/toolbox,
@@ -85524,6 +85506,39 @@
},
/turf/open/floor/iron,
/area/station/security/prison/safe)
+"uSj" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/shield/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/shield/riot,
+/obj/item/shield/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"uSp" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -86182,6 +86197,9 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/engineering/main)
+"vaA" = (
+/turf/closed/wall/r_wall,
+/area/station/security/evidence)
"vaE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -86498,6 +86516,11 @@
/mob/living/simple_animal/hostile/lizard/wags_his_tail,
/turf/open/floor/iron/checker,
/area/station/service/janitor)
+"ven" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/evidence)
"veu" = (
/obj/machinery/light_switch/directional/south,
/obj/structure/extinguisher_cabinet/directional/east,
@@ -86683,6 +86706,18 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/engineering/hallway)
+"vhi" = (
+/obj/structure/sign/poster/official/help_others{
+ pixel_x = 32
+ },
+/obj/machinery/light/warm/directional/south,
+/obj/structure/closet/secure_closet/psychology,
+/obj/item/toy/plush/beeplushie{
+ desc = "Maybe hugging this will make you feel better about yourself.";
+ name = "Therabee"
+ },
+/turf/open/floor/wood,
+/area/station/medical/psychology)
"vhq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -87315,6 +87350,14 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
+"voF" = (
+/obj/structure/closet{
+ name = "Evidence Closet"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"voG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
@@ -87437,6 +87480,12 @@
dir = 1
},
/area/station/service/kitchen)
+"vqn" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/suit_storage_unit/security,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"vqt" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -87942,6 +87991,22 @@
},
/turf/open/floor/iron,
/area/station/cargo/office)
+"vwh" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Security E.V.A. Storage"
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/armory,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/security/evidence)
"vwl" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/item/kirbyplants/random,
@@ -90790,13 +90855,6 @@
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron/large,
/area/station/security/checkpoint/medical/medsci)
-"wgY" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"whb" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -92362,39 +92420,6 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/science/ordnance)
-"wwR" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/shield/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/shield/riot,
-/obj/item/shield/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"wwV" = (
/obj/effect/spawner/random/structure/girder,
/turf/open/floor/plating,
@@ -93078,13 +93103,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/storage)
-"wEY" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"wFc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -94493,16 +94511,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/command/gateway)
-"xbh" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/item/bedsheet/dorms{
- dir = 1
- },
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"xbi" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance_hatch{
@@ -95063,14 +95071,6 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
-"xhz" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/machinery/camera/directional/south{
- c_tag = "Security - Evidence Storage"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"xhE" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -95912,13 +95912,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/command/corporate_showroom)
-"xsW" = (
-/obj/structure/closet{
- name = "Evidence Closet"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"xtg" = (
/obj/structure/cable,
/obj/machinery/door/firedoor,
@@ -99430,6 +99423,13 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/engineering/atmos/project)
+"ylR" = (
+/obj/structure/closet/l3closet/security,
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"ylT" = (
/obj/machinery/newscaster/directional/west,
/obj/effect/turf_decal/tile/brown{
@@ -106520,14 +106520,14 @@ aaa
btH
btH
btH
-grb
+tTe
cKE
btH
bEf
btH
rhH
ueB
-dur
+lbz
btH
bPC
bRC
@@ -129936,7 +129936,7 @@ pTC
pTC
unj
hyg
-nvN
+eCO
xdR
iCI
pTC
@@ -138207,7 +138207,7 @@ aaM
qYL
qYL
qYL
-twq
+aYl
qYL
qYL
bhw
@@ -141797,8 +141797,8 @@ dWt
iAm
uxB
qGY
-nZj
-fHN
+kaZ
+mym
dki
lvZ
jQB
@@ -142055,7 +142055,7 @@ xpW
kfE
mZk
itY
-jgH
+vhi
dki
lcw
gyn
@@ -149989,9 +149989,9 @@ oCP
rqa
ibo
kGA
-fhC
+aqS
yaI
-xbh
+pUm
hLA
vty
kUC
@@ -151241,9 +151241,9 @@ vgK
wGg
vgK
vgK
-sRd
-ohI
-sRd
+vaA
+cOy
+vaA
ufR
lra
sle
@@ -151498,9 +151498,9 @@ pWH
xng
atW
vgK
-iju
-wEY
-auI
+voF
+kEa
+ofb
lra
nrh
nbk
@@ -151755,9 +151755,9 @@ vSt
dzr
sbD
vgK
-xsW
-qKX
-jyV
+dcM
+aVh
+lGW
fpc
esZ
lcT
@@ -152012,9 +152012,9 @@ eBE
gIV
eYo
vgK
-ryB
-agJ
-oJW
+qTe
+cxq
+gGl
ufR
peu
rIa
@@ -152038,7 +152038,7 @@ juF
rYA
yaI
spz
-wgY
+nKe
yaI
xQZ
xnF
@@ -152269,9 +152269,9 @@ xoI
lTt
ndP
vgK
-kiG
-agJ
-xhz
+qgY
+cxq
+csV
ufR
xEL
oiC
@@ -152298,15 +152298,15 @@ qqe
twv
yaI
fNn
-qzk
+uEo
lsg
yaI
pwC
-ibR
+oLO
vmP
yaI
xxN
-ibR
+oLO
qfH
yaI
ouy
@@ -152334,7 +152334,7 @@ dvu
oCG
nXH
cln
-aaC
+jGJ
cma
iDQ
lcW
@@ -152526,9 +152526,9 @@ cpA
tLx
tAJ
vgK
-jNM
-jLm
-jNM
+ven
+vwh
+ven
bLs
bLs
bPw
@@ -152783,9 +152783,9 @@ bqY
tLx
ocm
vgK
-mub
-nRh
-rlU
+pbT
+fBM
+ylR
bLs
nfZ
pDt
@@ -153040,9 +153040,9 @@ eOv
tLx
qCe
vgK
-fqs
-fHX
-dEZ
+ttg
+cRV
+aZf
bLs
nlZ
uVJ
@@ -153297,9 +153297,9 @@ tNy
ukq
vGX
vgK
-aWO
-dav
-aWO
+vqn
+gwC
+vqn
bLs
iRi
nIV
@@ -153554,15 +153554,15 @@ mrD
tAd
uPg
iDq
-sRd
-jNM
-sRd
+vaA
+ven
+vaA
bLs
aqW
aEs
cVj
wow
-wwR
+uSj
nmT
dwU
wtB
@@ -153803,7 +153803,7 @@ tAj
oSd
sMX
bRG
-hNy
+fnx
gNx
aQD
iDq
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 1394e9ea25a..5736682125c 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -389,11 +389,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
-"aic" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/turf/open/floor/plating,
-/area/station/security/evidence)
"ait" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -5039,6 +5034,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/closed/wall,
/area/station/maintenance/port/fore)
+"bBw" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/unres{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"bBx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -6949,6 +6958,18 @@
/obj/effect/turf_decal/tile/blue/full,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
+"ccp" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/south{
+ id = "Dorm5";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"ccr" = (
/obj/effect/turf_decal/tile/red/half,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7982,17 +8003,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
-"csP" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Evidence Storage"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/machinery/door/firedoor,
-/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/textured_large,
-/area/station/security/evidence)
"csT" = (
/turf/open/floor/circuit/telecomms/mainframe,
/area/station/tcommsat/server)
@@ -8818,6 +8828,10 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
+"cEu" = (
+/obj/item/trash/sosjerky,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
"cEv" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
@@ -9282,6 +9296,13 @@
/obj/structure/closet/cardboard,
/turf/open/floor/iron,
/area/station/maintenance/port/fore)
+"cLz" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/evidence)
"cLB" = (
/obj/machinery/computer/prisoner/gulag_teleporter_computer{
dir = 4
@@ -9520,18 +9541,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/textured,
/area/station/service/hydroponics/garden)
-"cNY" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/south{
- id = "Dorm5";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"cOa" = (
/obj/structure/sign/warning/secure_area{
desc = "A warning sign which reads 'SERVER ROOM'.";
@@ -10398,6 +10407,18 @@
/obj/structure/cable,
/turf/open/floor/carpet/red,
/area/station/security/prison/work)
+"dcq" = (
+/obj/structure/bed,
+/obj/machinery/airalarm/directional/north,
+/obj/item/bedsheet/dorms,
+/obj/machinery/button/door/directional/east{
+ id = "Dorm3";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"dct" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -11313,9 +11334,6 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
-"dpR" = (
-/turf/closed/wall/r_wall,
-/area/station/security/evidence)
"dqd" = (
/obj/machinery/iv_drip,
/obj/structure/mirror/directional/north{
@@ -14660,23 +14678,6 @@
/obj/machinery/vending/coffee,
/turf/open/floor/iron,
/area/station/commons/locker)
-"erF" = (
-/obj/item/bodypart/head,
-/obj/effect/decal/cleanable/blood,
-/obj/item/bodypart/l_arm{
- pixel_x = -9;
- pixel_y = -9
- },
-/obj/item/bodypart/l_leg,
-/obj/item/bodypart/r_arm,
-/obj/item/bodypart/r_leg{
- pixel_x = 8;
- pixel_y = 4
- },
-/obj/item/bodypart/chest,
-/obj/item/organ/internal/heart,
-/turf/open/misc/asteroid/snow/icemoon,
-/area/icemoon/underground/explored)
"erJ" = (
/obj/structure/table,
/obj/item/lipstick/random,
@@ -17073,13 +17074,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden,
/turf/closed/wall,
/area/station/medical/cryo)
-"fee" = (
-/obj/structure/closet{
- name = "Evidence Closet 2"
- },
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark/textured_edge,
-/area/station/security/evidence)
"fez" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
@@ -17825,12 +17819,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"fpT" = (
-/obj/structure/closet/secure_closet/evidence,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 1
- },
-/area/station/security/evidence)
"fpW" = (
/obj/structure/sign/poster/official/random/directional/north,
/turf/open/floor/wood,
@@ -18678,15 +18666,6 @@
/obj/machinery/requests_console/auto_name/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"fEj" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
"fEA" = (
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance{
@@ -20729,6 +20708,14 @@
"glh" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/port/aft)
+"gli" = (
+/obj/structure/closet{
+ name = "Evidence Closet 5"
+ },
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/evidence)
"glk" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -25248,18 +25235,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"hIT" = (
-/obj/structure/bed,
-/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/dorms,
-/obj/machinery/button/door/directional/east{
- id = "Dorm2";
- name = "Dorm Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"hIU" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
@@ -26431,6 +26406,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark,
/area/station/medical/cryo)
+"icb" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/evidence)
"ick" = (
/obj/effect/spawner/random/trash/grille_or_waste,
/obj/effect/mapping_helpers/broken_floor,
@@ -27632,14 +27612,13 @@
},
/turf/open/floor/wood,
/area/station/service/library)
-"ivO" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark/textured_edge,
-/area/station/security/evidence)
"iwf" = (
/turf/closed/wall/r_wall,
/area/mine/mechbay)
+"iwl" = (
+/obj/effect/mapping_helpers/iannewyear,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/hop)
"iwo" = (
/obj/machinery/door/airlock/medical/glass{
name = "Infirmary"
@@ -32963,6 +32942,15 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/crew_quarters/bar)
+"kbY" = (
+/obj/structure/closet{
+ name = "Evidence Closet 3"
+ },
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Lower Brig Evidence"
+ },
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/evidence)
"kcc" = (
/obj/machinery/camera/directional/west{
c_tag = "Security - Infirmary"
@@ -33046,17 +33034,6 @@
},
/turf/open/floor/plating,
/area/station/security/prison/visit)
-"kcR" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/machinery/button/door/directional/south{
- id = "Dorm6";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"kdc" = (
/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
dir = 8
@@ -33545,6 +33522,17 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/commons/locker)
+"kkv" = (
+/obj/machinery/door/airlock/security/glass{
+ name = "Evidence Storage"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/machinery/door/firedoor,
+/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/textured_large,
+/area/station/security/evidence)
"kkB" = (
/obj/machinery/light/small/directional/south,
/obj/structure/closet/secure_closet/brig{
@@ -35717,19 +35705,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
-"kRs" = (
-/obj/structure/bed,
-/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/dorms,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/east{
- id = "Dorm4";
- name = "Dorm Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"kRw" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/stripes/line{
@@ -37084,14 +37059,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/mine/laborcamp)
-"lmL" = (
-/obj/structure/closet{
- name = "Evidence Closet 5"
- },
-/turf/open/floor/iron/dark/textured_edge{
- dir = 1
- },
-/area/station/security/evidence)
"lmM" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
@@ -37709,6 +37676,11 @@
/obj/machinery/meter,
/turf/open/floor/iron,
/area/station/engineering/atmos)
+"lxX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/evidence)
"lye" = (
/obj/effect/turf_decal/bot_white/right,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -38282,14 +38254,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/wood/parquet,
/area/station/commons/lounge)
-"lHl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/evidence)
"lHu" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/cable,
@@ -38657,14 +38621,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/maintenance/department/electrical)
-"lOY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/evidence)
"lPb" = (
/obj/structure/railing/corner,
/obj/structure/railing/corner{
@@ -40210,10 +40166,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/service/hydroponics)
-"mpW" = (
-/obj/item/trash/sosjerky,
-/turf/open/floor/plating,
-/area/station/maintenance/starboard/aft)
"mpZ" = (
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
@@ -41329,6 +41281,18 @@
/obj/item/taperecorder,
/turf/open/floor/wood,
/area/station/service/lawoffice)
+"mJO" = (
+/obj/structure/bed,
+/obj/machinery/airalarm/directional/north,
+/obj/item/bedsheet/dorms,
+/obj/machinery/button/door/directional/east{
+ id = "Dorm2";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"mJX" = (
/obj/structure/cable,
/obj/effect/spawner/structure/window/hollow/reinforced/middle,
@@ -41951,17 +41915,12 @@
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/ai_monitored/turret_protected/ai_upload)
"mVD" = (
-/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"mVY" = (
@@ -44736,6 +44695,15 @@
/obj/item/hand_tele,
/turf/open/floor/iron,
/area/station/command/teleporter)
+"nKi" = (
+/obj/structure/closet{
+ name = "Evidence Closet 4"
+ },
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/evidence)
"nKl" = (
/obj/structure/railing{
dir = 6
@@ -45071,6 +45039,19 @@
/obj/structure/sign/poster/contraband/random/directional/east,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
+"nOl" = (
+/obj/structure/bed,
+/obj/machinery/airalarm/directional/north,
+/obj/item/bedsheet/dorms,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/east{
+ id = "Dorm4";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"nOw" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -46754,10 +46735,6 @@
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/command/heads_quarters/rd)
-"ool" = (
-/obj/effect/mapping_helpers/iannewyear,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/hop)
"ooo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/processor/slime,
@@ -47034,39 +47011,6 @@
"orK" = (
/turf/open/floor/iron/grimy,
/area/station/ai_monitored/turret_protected/aisat_interior)
-"orO" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/shield/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/shield/riot,
-/obj/item/shield/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/red/half,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark/textured,
-/area/station/ai_monitored/security/armory)
"orP" = (
/obj/effect/landmark/blobstart,
/obj/machinery/camera{
@@ -48072,6 +48016,16 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/service)
+"oGS" = (
+/obj/structure/table/wood,
+/obj/machinery/libraryscanner{
+ pixel_y = 5;
+ pixel_x = -3
+ },
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/wood,
+/area/station/service/library)
"oGX" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
@@ -49586,6 +49540,17 @@
dir = 1
},
/area/station/hallway/primary/central)
+"piC" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/machinery/button/door/directional/south{
+ id = "Dorm6";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"piI" = (
/obj/machinery/airalarm/directional/south,
/obj/machinery/camera{
@@ -49770,11 +49735,6 @@
},
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hos)
-"plz" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/evidence)
"plS" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -50634,15 +50594,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/sepia,
/area/station/service/library)
-"pyL" = (
-/obj/structure/closet{
- name = "Evidence Closet 4"
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 1
- },
-/area/station/security/evidence)
"pyM" = (
/obj/effect/turf_decal/siding/yellow{
dir = 1
@@ -50703,15 +50654,6 @@
},
/turf/open/floor/engine,
/area/station/engineering/atmos/hfr_room)
-"pzw" = (
-/obj/structure/closet{
- name = "Evidence Closet 3"
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Security - Lower Brig Evidence"
- },
-/turf/open/floor/iron/dark/textured_edge,
-/area/station/security/evidence)
"pzC" = (
/obj/machinery/firealarm/directional/north,
/obj/effect/turf_decal/siding/yellow{
@@ -51439,6 +51381,39 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"pMk" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/shield/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/shield/riot,
+/obj/item/shield/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/red/half,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/textured,
+/area/station/ai_monitored/security/armory)
"pMq" = (
/obj/machinery/camera/directional/south{
c_tag = "Atmospherics Storage Room - South"
@@ -53227,6 +53202,23 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
+"qrg" = (
+/obj/item/bodypart/head,
+/obj/effect/decal/cleanable/blood,
+/obj/item/bodypart/l_arm{
+ pixel_x = -9;
+ pixel_y = -9
+ },
+/obj/item/bodypart/l_leg,
+/obj/item/bodypart/r_arm,
+/obj/item/bodypart/r_leg{
+ pixel_x = 8;
+ pixel_y = 4
+ },
+/obj/item/bodypart/chest,
+/obj/item/organ/internal/heart,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
"qrj" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing{
@@ -57254,16 +57246,6 @@
dir = 1
},
/area/mine/living_quarters)
-"rEs" = (
-/obj/structure/table/wood,
-/obj/machinery/libraryscanner{
- pixel_y = 5;
- pixel_x = -3
- },
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/wood,
-/area/station/service/library)
"rEx" = (
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark,
@@ -59049,6 +59031,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/large,
/area/station/engineering/lobby)
+"siD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/evidence)
"siF" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -59341,12 +59331,6 @@
/obj/machinery/microwave,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"snA" = (
-/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/textured_large,
-/area/station/security/evidence)
"snE" = (
/obj/effect/turf_decal/tile/red/half{
dir = 4
@@ -59816,6 +59800,14 @@
dir = 8
},
/area/station/science/lab)
+"suL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/security/evidence)
"suR" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -62104,6 +62096,15 @@
dir = 10
},
/area/station/science/lab)
+"tiq" = (
+/obj/structure/closet{
+ name = "Evidence Closet 6"
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/evidence)
"tis" = (
/obj/structure/window/reinforced/fulltile,
/obj/structure/transit_tube/horizontal,
@@ -62323,13 +62324,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large,
/area/station/cargo/warehouse)
-"tlD" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark/textured_edge,
-/area/station/security/evidence)
"tlE" = (
/turf/open/floor/glass/reinforced/icemoon,
/area/icemoon/surface/outdoors/nospawn)
@@ -63209,15 +63203,6 @@
},
/turf/open/floor/glass/reinforced,
/area/station/engineering/atmos/pumproom)
-"tyZ" = (
-/obj/structure/closet{
- name = "Evidence Closet 6"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 1
- },
-/area/station/security/evidence)
"tza" = (
/obj/structure/sink/directional/east,
/turf/open/floor/iron,
@@ -65760,6 +65745,13 @@
/obj/structure/window/reinforced,
/turf/open/floor/iron,
/area/station/science/xenobiology)
+"umj" = (
+/obj/structure/closet{
+ name = "Evidence Closet 2"
+ },
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/evidence)
"umo" = (
/obj/structure/chair/plastic{
dir = 4
@@ -65990,6 +65982,9 @@
},
/turf/open/floor/iron/dark/smooth_large,
/area/station/command/heads_quarters/ce)
+"uoJ" = (
+/turf/closed/wall/r_wall,
+/area/station/security/evidence)
"uoT" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/structure/table,
@@ -67022,6 +67017,12 @@
},
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
+"uHj" = (
+/obj/structure/closet/secure_closet/evidence,
+/turf/open/floor/iron/dark/textured_edge{
+ dir = 1
+ },
+/area/station/security/evidence)
"uHv" = (
/obj/structure/chair/stool/directional/north,
/obj/structure/cable,
@@ -69298,6 +69299,11 @@
/obj/effect/turf_decal/tile/blue/full,
/turf/open/floor/iron/large,
/area/station/medical/treatment_center)
+"vtn" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/dark/textured_edge,
+/area/station/security/evidence)
"vtr" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/kirbyplants/random,
@@ -70178,18 +70184,6 @@
},
/turf/open/openspace,
/area/station/science/xenobiology)
-"vGD" = (
-/obj/structure/bed,
-/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/dorms,
-/obj/machinery/button/door/directional/east{
- id = "Dorm3";
- name = "Dorm Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"vGI" = (
/obj/effect/mapping_helpers/airlock/locked,
/obj/machinery/door/airlock/vault{
@@ -70656,11 +70650,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/security/prison/mess)
-"vPw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/evidence)
"vPx" = (
/turf/open/floor/iron/dark/textured,
/area/station/security/prison/workout)
@@ -72797,6 +72786,12 @@
/obj/effect/spawner/random/trash/cigbutt,
/turf/open/floor/iron,
/area/station/engineering/lobby)
+"wuX" = (
+/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/textured_large,
+/area/station/security/evidence)
"wva" = (
/obj/machinery/light/directional/west,
/turf/open/floor/engine,
@@ -77739,6 +77734,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"xUV" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/hollow/reinforced/middle,
+/turf/open/floor/plating,
+/area/station/security/evidence)
"xUW" = (
/obj/machinery/airalarm/directional/south,
/obj/machinery/light/directional/south,
@@ -91932,7 +91932,7 @@ oSU
iDt
exv
iDt
-erF
+qrg
iDt
iDt
exv
@@ -170336,7 +170336,7 @@ oZR
oVY
pez
yiL
-orO
+pMk
cxO
xuA
tuc
@@ -170605,10 +170605,10 @@ hgM
pJu
rWU
hgM
-plz
-csP
-plz
-dpR
+icb
+kkv
+icb
+uoJ
hQt
lyg
gjq
@@ -170862,10 +170862,10 @@ hgM
pgG
hBg
hgM
-tlD
-snA
-pyL
-dpR
+cLz
+wuX
+nKi
+uoJ
gjq
gjq
gjq
@@ -171119,10 +171119,10 @@ hgM
svw
hBg
hgM
-fee
-lOY
-lmL
-aic
+umj
+suL
+gli
+xUV
gjq
gjq
gjq
@@ -171376,10 +171376,10 @@ hgM
fvO
nrF
hgM
-pzw
-vPw
-tyZ
-aic
+kbY
+lxX
+tiq
+xUV
gjq
gjq
gjq
@@ -171633,10 +171633,10 @@ hgM
svw
eHK
hgM
-ivO
-lHl
-fpT
-aic
+vtn
+siD
+uHj
+xUV
gjq
gjq
gjq
@@ -236192,7 +236192,7 @@ xvZ
iYb
mlY
cqQ
-ool
+iwl
jRC
shc
sFy
@@ -240522,16 +240522,16 @@ sDl
skl
jOQ
skl
-kRs
+nOl
oCF
ygB
-vGD
+dcq
peb
ygB
-hIT
+mJO
oCF
ygB
-hIT
+mJO
oCF
ygB
lBD
@@ -242322,7 +242322,7 @@ cIK
jOQ
skl
ddr
-cNY
+ccp
ygB
lXD
gya
@@ -243350,7 +243350,7 @@ iHz
jOQ
skl
pOo
-kcR
+piC
ygB
nOD
aos
@@ -254937,7 +254937,7 @@ dYt
nyl
prg
tyv
-rEs
+oGS
cHh
cHh
nuw
@@ -255252,7 +255252,7 @@ bgx
bgx
vzD
vzD
-mVD
+bBw
vzD
gQw
bln
@@ -255509,8 +255509,8 @@ dmt
jCl
jCl
vzD
-fEj
-mpW
+mVD
+cEu
vzD
vzD
vzD
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 4b25c28f8ce..7d95417b074 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -716,6 +716,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/aft)
+"aiq" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/item/bedsheet/captain{
+ dir = 4
+ },
+/obj/effect/landmark/start/captain,
+/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/carpet/royalblue,
+/area/station/command/heads_quarters/captain/private)
"aiB" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -730,13 +742,6 @@
/obj/effect/mapping_helpers/airlock/access/any/service/janitor,
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/aft)
-"aiD" = (
-/obj/structure/bed,
-/obj/effect/landmark/start/assistant,
-/obj/item/bedsheet/dorms,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood,
-/area/station/commons/locker)
"aiI" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1447,6 +1452,17 @@
dir = 4
},
/area/station/command/heads_quarters/qm)
+"arv" = (
+/obj/structure/table,
+/obj/item/stack/package_wrap,
+/obj/item/hand_labeler,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"arz" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/tank/internals/emergency_oxygen/empty,
@@ -1518,15 +1534,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/hallway/secondary/entry)
-"ate" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"ath" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -1868,17 +1875,6 @@
/obj/machinery/telecomms/broadcaster/preset_right,
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/station/tcommsat/server)
-"azR" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/effect/landmark/start/assistant,
-/obj/item/bedsheet/dorms{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood,
-/area/station/commons/locker)
"aAg" = (
/turf/closed/wall/r_wall/rust,
/area/station/ai_monitored/turret_protected/ai)
@@ -3266,18 +3262,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/service/janitor)
-"aVH" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/item/bedsheet/captain{
- dir = 4
- },
-/obj/effect/landmark/start/captain,
-/obj/structure/sign/poster/contraband/random/directional/north,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/royalblue,
-/area/station/command/heads_quarters/captain/private)
"aVI" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
@@ -5241,31 +5225,6 @@
},
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"bDQ" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/fireaxecabinet/directional/north,
-/obj/machinery/camera/directional/north{
- c_tag = "Atmospherics Scrubbers";
- name = "atmospherics camera";
- network = list("ss13","engine")
- },
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
"bDV" = (
/obj/structure/sink/directional/south,
/obj/effect/turf_decal/tile/blue{
@@ -5513,6 +5472,16 @@
/obj/effect/landmark/start/cargo_technician,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"bIc" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/security{
+ name = "Evidence"
+ },
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"bId" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
@@ -6159,16 +6128,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"bUJ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/security{
- name = "Evidence"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"bUN" = (
/turf/open/floor/plating/airless,
/area/space)
@@ -6585,6 +6544,9 @@
/obj/effect/decal/cleanable/cobweb,
/turf/closed/mineral/random/labormineral,
/area/space/nearstation)
+"ccO" = (
+/turf/closed/wall/r_wall,
+/area/station/security/evidence)
"ccP" = (
/obj/structure/lattice,
/obj/structure/window/reinforced{
@@ -7883,20 +7845,6 @@
"csa" = (
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"csj" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/item/radio/intercom,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
"csk" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8301,6 +8249,22 @@
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron/dark,
/area/station/cargo/storage)
+"czz" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/landmark/start/assistant,
+/obj/item/bedsheet/dorms,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/north{
+ id = "Cabin_2";
+ name = "Cabin 2 Privacy Lock";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/wood,
+/area/station/commons/locker)
"czH" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -12459,6 +12423,10 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"dLa" = (
+/obj/structure/sign/xenobio_guide,
+/turf/closed/wall/rust,
+/area/station/science/xenobiology)
"dLh" = (
/obj/machinery/door/airlock/command/glass{
name = "Bridge Access"
@@ -14602,6 +14570,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
+"erS" = (
+/turf/closed/wall,
+/area/station/security/evidence)
"esn" = (
/obj/structure/table/reinforced,
/obj/item/clipboard,
@@ -15548,19 +15519,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"eGk" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/obj/machinery/monkey_recycler,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"eGC" = (
/obj/structure/railing/corner{
dir = 1
@@ -19006,6 +18964,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"fAs" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/machinery/door/airlock/research/glass{
+ name = "Slime Euthanization Chamber"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
+/turf/open/floor/iron/dark,
+/area/station/science/xenobiology)
"fAI" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -19442,22 +19411,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
-"fGC" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"fGI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22375,13 +22328,6 @@
/obj/machinery/status_display/evac/directional/north,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
-"gvx" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"gvM" = (
/obj/structure/cable,
/obj/structure/table,
@@ -23439,6 +23385,9 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/service/bar/atrium)
+"gKm" = (
+/turf/closed/wall/rust,
+/area/station/security/evidence)
"gKB" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/table_frame,
@@ -24169,6 +24118,18 @@
},
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
+"gUs" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"gUw" = (
/obj/machinery/power/solar{
id = "aftport";
@@ -24604,6 +24565,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/showroomfloor,
/area/station/service/bar/atrium)
+"hbP" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/research/glass{
+ name = "Xenobiology Closet"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
+/turf/open/floor/iron/dark,
+/area/station/science/xenobiology)
"hbT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24810,6 +24781,24 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/textured,
/area/station/cargo/storage)
+"hfF" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/landmark/start/assistant,
+/obj/item/bedsheet/dorms{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/north{
+ id = "Cabin_3";
+ name = "Cabin 3 Privacy Lock";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/station/commons/locker)
"hfP" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security{
@@ -26307,9 +26296,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
-"hAP" = (
-/turf/closed/wall/r_wall,
-/area/station/security/evidence)
"hBa" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -27918,6 +27904,13 @@
dir = 1
},
/area/station/service/chapel)
+"hUI" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"hUL" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -28689,6 +28682,39 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"ifv" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/item/mmi,
+/obj/item/bodypart/chest/robot{
+ pixel_y = 4
+ },
+/obj/item/bodypart/r_leg/robot{
+ pixel_x = 6
+ },
+/obj/item/bodypart/r_arm/robot{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/bodypart/l_leg/robot{
+ pixel_x = -6
+ },
+/obj/item/bodypart/l_arm/robot{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/bodypart/head/robot,
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
"ifw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -31385,6 +31411,10 @@
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
+"iQH" = (
+/obj/effect/spawner/structure/window/reinforced/tinted,
+/turf/open/floor/plating,
+/area/station/security/evidence)
"iQK" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/dirt,
@@ -31811,18 +31841,6 @@
/obj/structure/sign/poster/contraband/random/directional/south,
/turf/closed/wall,
/area/station/maintenance/port/lesser)
-"iVV" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"iWj" = (
/obj/structure/table,
/obj/effect/turf_decal/bot,
@@ -32444,17 +32462,6 @@
},
/turf/open/floor/plating,
/area/station/service/chapel)
-"jeR" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"jeS" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/engine/o2,
@@ -32596,18 +32603,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/dark,
/area/station/security/medical)
-"jgy" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"jgz" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -32937,9 +32932,6 @@
/obj/item/radio/intercom/directional/east,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/greater)
-"jkk" = (
-/turf/closed/wall,
-/area/station/security/evidence)
"jks" = (
/obj/effect/turf_decal/bot,
/obj/structure/table,
@@ -33479,6 +33471,9 @@
},
/turf/open/floor/iron/dark,
/area/station/security/processing)
+"jvA" = (
+/turf/closed/wall/r_wall/rust,
+/area/station/security/evidence)
"jvQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/burnt_floor,
@@ -35610,10 +35605,6 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
-"kcn" = (
-/obj/structure/sign/xenobio_guide,
-/turf/closed/wall/rust,
-/area/station/science/xenobiology)
"kcx" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -36635,9 +36626,6 @@
/obj/structure/sign/warning/electric_shock,
/turf/closed/wall/r_wall,
/area/station/maintenance/port/aft)
-"kvl" = (
-/turf/closed/wall/r_wall/rust,
-/area/station/security/evidence)
"kvo" = (
/obj/structure/table,
/obj/machinery/firealarm/directional/west,
@@ -37537,6 +37525,19 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/port/greater)
+"kJD" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/camera/directional/east{
+ c_tag = "Evidence Closet"
+ },
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"kJH" = (
/obj/effect/turf_decal/bot,
/obj/machinery/holopad,
@@ -38457,6 +38458,19 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
+"kVq" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/obj/machinery/monkey_recycler,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/science/xenobiology)
"kVv" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -39395,6 +39409,16 @@
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"lic" = (
+/obj/item/clothing/head/helmet/toggleable/justice/escape{
+ name = "justice helmet"
+ },
+/obj/structure/sign/poster/official/the_owl{
+ pixel_y = 32
+ },
+/obj/effect/mapping_helpers/broken_floor,
+/turf/open/floor/plating,
+/area/station/maintenance/aft)
"lie" = (
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral,
@@ -40390,15 +40414,6 @@
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"lwn" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"lwp" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -41596,19 +41611,6 @@
"lOX" = (
/turf/closed/wall/r_wall,
/area/station/engineering/supermatter)
-"lOY" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Evidence Closet"
- },
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"lOZ" = (
/obj/effect/turf_decal/box,
/obj/machinery/shower/directional/west,
@@ -42203,15 +42205,6 @@
/obj/structure/railing/corner,
/turf/open/floor/iron/showroomfloor,
/area/station/service/bar/atrium)
-"lYG" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"lYT" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -44102,18 +44095,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
-"mCg" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/grunge{
- name = "Morgue"
- },
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
"mCk" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/abandoned,
@@ -44671,20 +44652,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/medbay/central)
-"mKv" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/structure/chair/comfy,
-/obj/item/radio/intercom/command/directional/north,
-/turf/open/floor/iron,
-/area/station/security/courtroom)
"mKw" = (
/obj/structure/cable,
/obj/effect/turf_decal/siding/wood{
@@ -45280,9 +45247,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/courtroom)
-"mRp" = (
-/turf/closed/wall/rust,
-/area/station/security/evidence)
"mRF" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -46290,24 +46254,6 @@
},
/turf/open/floor/plating,
/area/station/cargo/warehouse)
-"ngB" = (
-/obj/structure/bed{
- dir = 4
- },
-/obj/machinery/airalarm/directional/west,
-/obj/effect/landmark/start/assistant,
-/obj/item/bedsheet/dorms{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/north{
- id = "Cabin_3";
- name = "Cabin 3 Privacy Lock";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/station/commons/locker)
"ngF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/burnt_floor,
@@ -47167,14 +47113,6 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
-"nva" = (
-/obj/structure/table/reinforced,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/head/helmet/justice/escape{
- name = "justice helmet"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/office)
"nvq" = (
/obj/structure/chair/office/light,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47323,22 +47261,6 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/dark/corner,
/area/station/hallway/primary/central/fore)
-"nwF" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/landmark/start/assistant,
-/obj/item/bedsheet/dorms,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/north{
- id = "Cabin_2";
- name = "Cabin 2 Privacy Lock";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/wood,
-/area/station/commons/locker)
"nwI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -49349,6 +49271,20 @@
/obj/structure/flora/bush/pointy/style_random,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden)
+"oep" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/item/radio/intercom,
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
"oeF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/showroomfloor,
@@ -49359,6 +49295,15 @@
},
/turf/open/floor/engine/n2,
/area/station/engineering/atmos)
+"oeV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/mapping_helpers/ianbirthday,
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/hop)
"ofa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -49932,42 +49877,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/science/ordnance/storage)
-"oni" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/shield/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/shield/riot,
-/obj/item/shield/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"onm" = (
/obj/structure/rack,
/obj/effect/turf_decal/tile/neutral,
@@ -53350,6 +53259,15 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
+"plh" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"plj" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -59502,19 +59420,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
-"qXX" = (
-/obj/structure/closet{
- name = "Evidence Closet"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"qYr" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -62541,6 +62446,17 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/department/bridge)
+"rPx" = (
+/obj/structure/bed{
+ dir = 4
+ },
+/obj/effect/landmark/start/assistant,
+/obj/item/bedsheet/dorms{
+ dir = 4
+ },
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood,
+/area/station/commons/locker)
"rPy" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -65802,6 +65718,18 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/station/engineering/atmos/pumproom)
+"sLZ" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/grunge{
+ name = "Morgue"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/turf/open/floor/iron/dark,
+/area/station/medical/morgue)
"sMa" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -67065,6 +66993,31 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/exam_room)
+"tdE" = (
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/structure/fireaxecabinet/directional/north,
+/obj/machinery/camera/directional/north{
+ c_tag = "Atmospherics Scrubbers";
+ name = "atmospherics camera";
+ network = list("ss13","engine")
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
"tdW" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -69268,10 +69221,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/restrooms)
-"tIq" = (
-/obj/effect/spawner/structure/window/reinforced/tinted,
-/turf/open/floor/plating,
-/area/station/security/evidence)
"tIr" = (
/turf/closed/wall/rust,
/area/station/engineering/supermatter/room)
@@ -71463,6 +71412,15 @@
},
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
+"unJ" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"unQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
@@ -72178,6 +72136,22 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
/turf/open/floor/engine/vacuum,
/area/station/maintenance/disposal/incinerator)
+"uAw" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"uAA" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -73154,16 +73128,6 @@
/obj/machinery/pdapainter/security,
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/hos)
-"uQl" = (
-/obj/item/clothing/head/helmet/justice/escape{
- name = "justice helmet"
- },
-/obj/structure/sign/poster/official/the_owl{
- pixel_y = 32
- },
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/aft)
"uQn" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -73595,16 +73559,6 @@
/obj/structure/cable,
/turf/open/floor/grass,
/area/station/security/prison/garden)
-"uXy" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/research/glass{
- name = "Xenobiology Closet"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"uXB" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/firecloset,
@@ -74377,6 +74331,11 @@
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/station/science/xenobiology)
+"vhz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/brig)
"vhK" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -75002,17 +74961,6 @@
},
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
-"vrc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/machinery/door/airlock/research/glass{
- name = "Slime Euthanization Chamber"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology)
"vrd" = (
/obj/machinery/firealarm/directional/north,
/obj/structure/flora/bush/pointy/style_random,
@@ -75355,15 +75303,6 @@
},
/turf/open/floor/iron/dark,
/area/station/security/lockers)
-"vvC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/mapping_helpers/ianbirthday,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
"vvE" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -78074,18 +78013,6 @@
/obj/machinery/status_display/ai/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
-"weR" = (
-/obj/structure/closet{
- name = "Evidence Closet"
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"weV" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/lights/mixed,
@@ -79746,22 +79673,6 @@
"wDz" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/port/lesser)
-"wDF" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"wDI" = (
/obj/structure/flora/rock/pile/style_random,
/turf/open/misc/asteroid/lowpressure,
@@ -80644,6 +80555,18 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
+"wPa" = (
+/obj/structure/closet{
+ name = "Evidence Closet"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"wPh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -80695,11 +80618,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/starboard)
-"wPK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/brig)
"wPO" = (
/obj/structure/rack,
/obj/item/gun/energy/ionrifle{
@@ -80986,6 +80904,15 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/cargo/warehouse)
+"wTF" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"wTS" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
@@ -81041,6 +80968,20 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
+"wVd" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/structure/chair/comfy,
+/obj/item/radio/intercom/command/directional/north,
+/turf/open/floor/iron,
+/area/station/security/courtroom)
"wVA" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue,
@@ -81558,6 +81499,13 @@
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron/dark,
/area/station/service/chapel/funeral)
+"xds" = (
+/obj/structure/bed,
+/obj/effect/landmark/start/assistant,
+/obj/item/bedsheet/dorms,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/wood,
+/area/station/commons/locker)
"xdv" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -82828,6 +82776,14 @@
"xvW" = (
/turf/closed/wall,
/area/station/medical/paramedic)
+"xwf" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/head/helmet/toggleable/justice/escape{
+ name = "justice helmet"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/office)
"xwk" = (
/obj/machinery/computer/security/mining,
/obj/effect/turf_decal/tile/neutral{
@@ -83445,6 +83401,18 @@
},
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
+"xFh" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"xFt" = (
/obj/structure/flora/grass/jungle/a/style_random,
/obj/structure/flora/bush/ferny/style_random,
@@ -84035,6 +84003,22 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/greater)
+"xOo" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"xOq" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -84461,6 +84445,42 @@
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/station/security/prison)
+"xUL" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/shield/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/shield/riot,
+/obj/item/shield/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"xUP" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -84479,39 +84499,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plating,
/area/station/maintenance/aft)
-"xVk" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/item/mmi,
-/obj/item/bodypart/chest/robot{
- pixel_y = 4
- },
-/obj/item/bodypart/r_leg/robot{
- pixel_x = 6
- },
-/obj/item/bodypart/r_arm/robot{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/bodypart/l_leg/robot{
- pixel_x = -6
- },
-/obj/item/bodypart/l_arm/robot{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/bodypart/head/robot,
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
"xVm" = (
/turf/closed/wall/r_wall/rust,
/area/station/engineering/gravity_generator)
@@ -85564,6 +85551,19 @@
/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
+"yjl" = (
+/obj/structure/closet{
+ name = "Evidence Closet"
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"yjq" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/duct,
@@ -104158,7 +104158,7 @@ aiN
ebW
pNe
dpw
-nva
+xwf
dUE
aVI
oKW
@@ -106450,7 +106450,7 @@ uHv
vgm
tSI
cYv
-aiD
+xds
iuC
fKJ
cuD
@@ -106477,7 +106477,7 @@ icQ
aka
psn
azo
-oni
+xUL
cez
sVP
qWZ
@@ -106963,7 +106963,7 @@ bCO
uHv
nQX
rhN
-ngB
+hfF
vea
jWD
bHP
@@ -107701,7 +107701,7 @@ dbK
pDs
geV
wbf
-mCg
+sLZ
sTZ
foP
lnc
@@ -107749,7 +107749,7 @@ uXL
aPF
tiY
nzW
-wPK
+vhz
eDx
srf
veu
@@ -107991,7 +107991,7 @@ nkd
tDs
xTt
rhN
-nwF
+czz
amn
pqD
ckJ
@@ -108004,11 +108004,11 @@ cXh
lqn
oQz
cXh
-jkk
-tIq
-bUJ
-jkk
-jkk
+erS
+iQH
+bIc
+erS
+erS
xap
wMe
ktu
@@ -108261,11 +108261,11 @@ nem
gME
dXz
ura
-mRp
-gvx
-ate
-jeR
-jkk
+gKm
+hUI
+plh
+arv
+erS
shC
sFF
wqZ
@@ -108506,7 +108506,7 @@ ikE
vgm
lqP
uhE
-azR
+rPx
pqD
pqD
iza
@@ -108518,11 +108518,11 @@ iHT
sSd
aLi
jVA
-jkk
-jgy
-fGC
-iVV
-mRp
+erS
+gUs
+uAw
+xFh
+gKm
gJL
odc
eoM
@@ -108775,11 +108775,11 @@ rqx
oJs
dxk
rmd
-jkk
-lwn
-wDF
-qXX
-jkk
+erS
+unJ
+xOo
+yjl
+erS
mdE
aUw
vyl
@@ -109032,11 +109032,11 @@ gCu
fRP
aLi
myc
-jkk
-lYG
-lOY
-weR
-hAP
+erS
+wTF
+kJD
+wPa
+ccO
xmO
sFF
war
@@ -109289,11 +109289,11 @@ bDu
tXX
nBE
rRY
-kvl
-hAP
-hAP
-hAP
-hAP
+jvA
+ccO
+ccO
+ccO
+ccO
dOk
rVE
hna
@@ -110331,7 +110331,7 @@ mCm
gmG
gmG
pDM
-uQl
+lic
qlD
gtU
nZE
@@ -113122,7 +113122,7 @@ fWB
rNX
eJc
sVh
-mKv
+wVd
trj
vCa
wNo
@@ -113904,7 +113904,7 @@ gLO
wbT
dod
dki
-vvC
+oeV
hrN
axt
fBI
@@ -114186,7 +114186,7 @@ biP
cfL
cfL
jwV
-bDQ
+tdE
ouC
kHQ
wRU
@@ -114945,7 +114945,7 @@ xCz
rIk
rIk
viM
-xVk
+ifv
dHq
nbH
nwh
@@ -115436,7 +115436,7 @@ xwk
kNS
pGe
sCK
-csj
+oep
dZM
qQQ
jXk
@@ -118520,7 +118520,7 @@ fHw
pdq
xyp
tXg
-aVH
+aiq
joL
wFl
tGS
@@ -122588,7 +122588,7 @@ mwp
lth
wpw
iPY
-vrc
+fAs
wpw
ffN
hnw
@@ -123875,7 +123875,7 @@ dmA
hvl
mOt
wpw
-eGk
+kVq
puJ
iKn
ndz
@@ -124130,8 +124130,8 @@ iSS
uLt
wpw
aQl
-uXy
-kcn
+hbP
+dLa
doy
hbe
doy
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 1f830547979..63022024ca9 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1136,6 +1136,18 @@
"avK" = (
/turf/closed/wall,
/area/station/maintenance/fore/lesser)
+"avU" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/button/door/directional/east{
+ id = "Cabin2";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"awt" = (
/obj/structure/window,
/obj/effect/turf_decal/tile/red/fourcorners,
@@ -2647,6 +2659,17 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai)
+"aVt" = (
+/obj/structure/closet{
+ name = "Evidence Closet 5"
+ },
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"aVX" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms Server Room"
@@ -3536,6 +3559,10 @@
/obj/item/stamp/cmo,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
+"bla" = (
+/obj/effect/spawner/random/engineering/tracking_beacon,
+/turf/open/floor/wood,
+/area/station/service/library)
"blb" = (
/obj/structure/plasticflaps/opaque,
/obj/machinery/door/window/left/directional/north{
@@ -3601,6 +3628,20 @@
},
/turf/open/floor/iron,
/area/station/command/gateway)
+"bmz" = (
+/obj/machinery/light/small/directional/north,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/button/door/directional/west{
+ id = "Cabin4";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"bmB" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -4177,15 +4218,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/port)
-"buI" = (
-/obj/item/kirbyplants/random,
-/obj/effect/turf_decal/siding/purple{
- dir = 5
- },
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"buL" = (
/obj/structure/closet/secure_closet/exile,
/obj/structure/extinguisher_cabinet/directional/west,
@@ -4419,14 +4451,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/turf/open/floor/iron,
/area/station/security/brig)
-"bAq" = (
-/obj/structure/closet/secure_closet/evidence,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"bAA" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8753,16 +8777,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
-"dlF" = (
-/obj/structure/closet{
- name = "Evidence Closet 4"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"dlG" = (
/obj/structure/cable,
/obj/item/radio/intercom/directional/north,
@@ -9480,20 +9494,6 @@
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"dAy" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/button/door/directional/west{
- id = "Cabin7";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"dBz" = (
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/tile/blue,
@@ -10476,23 +10476,6 @@
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
-"dSY" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"dTi" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -12424,17 +12407,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/service/bar)
-"eAy" = (
-/obj/machinery/computer/scan_consolenew{
- dir = 4
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/science/genetics)
"eAL" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/white,
@@ -12731,6 +12703,23 @@
"eIO" = (
/turf/closed/wall,
/area/station/maintenance/department/medical/central)
+"eJa" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"eJo" = (
/obj/machinery/firealarm/directional/east,
/obj/structure/table/wood,
@@ -12783,18 +12772,6 @@
},
/turf/open/floor/engine/co2,
/area/station/engineering/atmos)
-"eJU" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/button/door/directional/west{
- id = "Cabin5";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"eJX" = (
/turf/open/floor/iron,
/area/station/engineering/atmos)
@@ -12909,10 +12886,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
-"eLW" = (
-/obj/item/bodypart/l_arm,
-/turf/open/floor/plating/airless,
-/area/station/science/ordnance/bomb)
"eLX" = (
/obj/structure/chair,
/obj/structure/sign/warning/vacuum/external/directional/north,
@@ -12979,23 +12952,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
-"eMM" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"eMU" = (
/obj/effect/turf_decal/trimline/blue/filled/corner{
dir = 8
@@ -13152,6 +13108,9 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
+"eQr" = (
+/turf/closed/wall,
+/area/station/security/evidence)
"eQs" = (
/obj/machinery/air_sensor/air_tank,
/turf/open/floor/engine/air,
@@ -14438,6 +14397,9 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"fnz" = (
+/turf/closed/wall/r_wall,
+/area/station/security/evidence)
"fnE" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -14610,20 +14572,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/station/command/corporate_showroom)
-"fsu" = (
-/obj/machinery/light/small/directional/north,
-/obj/effect/decal/cleanable/cobweb,
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/button/door/directional/west{
- id = "Cabin4";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"fsN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -16205,20 +16153,6 @@
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/service/library)
-"fZp" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/cobweb,
-/obj/item/bedsheet/dorms,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/landmark/start/hangover,
-/obj/machinery/button/door/directional/west{
- id = "Cabin6";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"fZG" = (
/obj/item/radio/intercom/directional/north,
/obj/machinery/computer/security,
@@ -16368,6 +16302,18 @@
},
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
+"gbx" = (
+/obj/machinery/light/small/directional/north,
+/obj/effect/landmark/blobstart,
+/obj/machinery/camera/directional/north{
+ c_tag = "Security - Evidence Storage"
+ },
+/obj/item/storage/secure/safe/directional/north{
+ name = "evidence safe"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"gbG" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/obj/item/storage/box/lights/mixed,
@@ -16556,6 +16502,23 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hos)
+"gfC" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"gfD" = (
/obj/machinery/door/airlock/maintenance,
/obj/structure/cable,
@@ -23064,6 +23027,43 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
+"itb" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/bot,
+/obj/item/bodypart/r_arm/robot{
+ pixel_x = 3
+ },
+/obj/item/bodypart/l_arm/robot{
+ pixel_x = -3
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/firealarm/directional/west,
+/obj/item/assembly/flash/handheld{
+ pixel_x = 6;
+ pixel_y = 13
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 6;
+ pixel_y = 13
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 6;
+ pixel_y = 13
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 6;
+ pixel_y = 13
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 6;
+ pixel_y = 13
+ },
+/obj/machinery/ecto_sniffer{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/turf/open/floor/iron,
+/area/station/science/robotics/lab)
"itn" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/engine,
@@ -23831,43 +23831,6 @@
/obj/item/stock_parts/cell/high,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
-"iFN" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/bot,
-/obj/item/bodypart/r_arm/robot{
- pixel_x = 3
- },
-/obj/item/bodypart/l_arm/robot{
- pixel_x = -3
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/firealarm/directional/west,
-/obj/item/assembly/flash/handheld{
- pixel_x = 6;
- pixel_y = 13
- },
-/obj/item/assembly/flash/handheld{
- pixel_x = 6;
- pixel_y = 13
- },
-/obj/item/assembly/flash/handheld{
- pixel_x = 6;
- pixel_y = 13
- },
-/obj/item/assembly/flash/handheld{
- pixel_x = 6;
- pixel_y = 13
- },
-/obj/item/assembly/flash/handheld{
- pixel_x = 6;
- pixel_y = 13
- },
-/obj/machinery/ecto_sniffer{
- pixel_x = -6;
- pixel_y = 6
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
"iFR" = (
/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{
dir = 4
@@ -26167,16 +26130,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/locker)
-"jrQ" = (
-/obj/structure/closet{
- name = "Evidence Closet 3"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"jrT" = (
/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/yellow{
@@ -27925,17 +27878,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port)
-"jVj" = (
-/obj/structure/closet{
- name = "Evidence Closet 5"
- },
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"jVl" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{
@@ -28022,17 +27964,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
-"jWi" = (
-/obj/structure/closet{
- name = "Evidence Closet 2"
- },
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"jWj" = (
/obj/structure/cable,
/obj/machinery/light/small/directional/south,
@@ -28201,6 +28132,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/space,
/area/space/nearstation)
+"jZP" = (
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/purple{
+ dir = 5
+ },
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"jZR" = (
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/tile/neutral{
@@ -28276,18 +28216,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/white,
/area/station/science/research)
-"kaP" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security{
- name = "Evidence Storage"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kaS" = (
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/tile/yellow{
@@ -29895,16 +29823,6 @@
},
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
-"kGX" = (
-/obj/structure/filingcabinet/security{
- pixel_x = 4
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/half/contrasted{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kHg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -30733,11 +30651,6 @@
},
/turf/open/floor/iron,
/area/station/engineering/break_room)
-"kVM" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kVN" = (
/turf/open/floor/carpet,
/area/station/service/chapel)
@@ -32328,6 +32241,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"lxf" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/button/door/directional/west{
+ id = "Cabin5";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"lxm" = (
/obj/machinery/atmospherics/components/trinary/mixer/airmix{
dir = 4
@@ -36911,6 +36836,17 @@
"ndS" = (
/turf/closed/wall/r_wall,
/area/station/hallway/secondary/command)
+"neA" = (
+/obj/machinery/computer/scan_consolenew{
+ dir = 4
+ },
+/obj/effect/turf_decal/siding/purple{
+ dir = 8
+ },
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/science/genetics)
"neG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -37035,6 +36971,12 @@
},
/turf/open/floor/iron,
/area/station/security/courtroom)
+"nhA" = (
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"nhP" = (
/turf/open/floor/circuit/green,
/area/station/ai_monitored/turret_protected/ai_upload)
@@ -37174,35 +37116,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
-"njT" = (
-/obj/structure/rack,
-/obj/machinery/light/directional/west,
-/obj/item/clothing/head/helmet/riot{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_y = 2
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/clothing/head/helmet/alt{
- pixel_x = 3;
- pixel_y = -2
- },
-/obj/item/clothing/head/helmet/alt{
- pixel_y = -2
- },
-/obj/item/clothing/head/helmet/alt{
- pixel_x = -3;
- pixel_y = -2
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"njW" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -38304,14 +38217,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/white,
/area/station/medical/virology)
-"nBW" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"nCa" = (
/obj/machinery/meter/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{
@@ -40088,6 +39993,18 @@
},
/turf/open/floor/engine/plasma,
/area/station/engineering/atmos)
+"ojJ" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security{
+ name = "Evidence Storage"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"okQ" = (
/obj/effect/landmark/blobstart,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -42127,6 +42044,16 @@
},
/turf/open/floor/iron/white,
/area/station/security/medical)
+"oXb" = (
+/obj/structure/closet{
+ name = "Evidence Closet 3"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"oXd" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 4
@@ -44079,6 +44006,15 @@
/obj/structure/cable,
/turf/open/floor/circuit/green,
/area/station/science/robotics/mechbay)
+"pGr" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/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,
+/area/station/security/brig)
"pGt" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/random/maintenance/three,
@@ -45857,9 +45793,6 @@
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
-"qmP" = (
-/turf/closed/wall,
-/area/station/security/evidence)
"qmR" = (
/obj/machinery/light/small/directional/north,
/obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -47017,6 +46950,10 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/area/station/maintenance/starboard/greater)
+"qIa" = (
+/obj/item/bodypart/l_arm,
+/turf/open/floor/plating/airless,
+/area/station/science/ordnance/bomb)
"qIl" = (
/turf/closed/wall,
/area/station/hallway/secondary/command)
@@ -48918,6 +48855,17 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
+"rsL" = (
+/obj/structure/closet{
+ name = "Evidence Closet 2"
+ },
+/obj/machinery/airalarm/directional/west,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"rtd" = (
/obj/machinery/camera/motion/directional/east{
c_tag = "E.V.A. Storage"
@@ -50725,6 +50673,20 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
+"rUo" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/machinery/button/door/directional/west{
+ id = "Cabin7";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"rUE" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -51493,18 +51455,6 @@
/obj/item/storage/fancy/candle_box,
/turf/open/floor/engine/cult,
/area/station/service/library)
-"sfV" = (
-/obj/machinery/light/small/directional/north,
-/obj/effect/landmark/blobstart,
-/obj/machinery/camera/directional/north{
- c_tag = "Security - Evidence Storage"
- },
-/obj/item/storage/secure/safe/directional/north{
- name = "evidence safe"
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"sgc" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -52583,6 +52533,19 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
+"sBa" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/bedsheet/dorms,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/button/door/directional/east{
+ id = "Cabin3";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/wood,
+/area/station/commons/dorms)
"sBd" = (
/obj/structure/lattice,
/obj/item/stack/cable_coil,
@@ -55732,19 +55695,6 @@
},
/turf/open/floor/iron,
/area/station/security/office)
-"tCM" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/bedsheet/dorms,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/button/door/directional/east{
- id = "Cabin3";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/wood,
-/area/station/commons/dorms)
"tCS" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/starboard/fore)
@@ -55891,15 +55841,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
-"tHj" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/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,
-/area/station/security/brig)
"tHk" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/department_orders/service{
@@ -56263,12 +56204,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
-"tLI" = (
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"tLN" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -58176,18 +58111,6 @@
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
-"utJ" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/button/door/directional/east{
- id = "Cabin2";
- name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/carpet,
-/area/station/commons/dorms)
"utM" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=13.3-Engineering-Central";
@@ -58407,11 +58330,6 @@
"uxS" = (
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
-"uxV" = (
-/obj/effect/spawner/random/vending/snackvend,
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/hallway/primary/central)
"uyd" = (
/obj/structure/sign/warning/pods/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58729,6 +58647,14 @@
/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
+"uEt" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"uEw" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
@@ -58938,6 +58864,35 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/brig)
+"uGH" = (
+/obj/structure/rack,
+/obj/machinery/light/directional/west,
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_y = 2
+ },
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/obj/item/clothing/head/helmet/alt{
+ pixel_x = 3;
+ pixel_y = -2
+ },
+/obj/item/clothing/head/helmet/alt{
+ pixel_y = -2
+ },
+/obj/item/clothing/head/helmet/alt{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/blue/half/contrasted,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"uGQ" = (
/obj/machinery/light/directional/south,
/obj/machinery/newscaster/directional/south,
@@ -59666,10 +59621,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/engineering/atmos)
-"uVj" = (
-/obj/item/bodypart/l_leg,
-/turf/open/floor/plating/airless,
-/area/station/science/ordnance/bomb)
"uVm" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61797,9 +61748,6 @@
},
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
-"vHE" = (
-/turf/closed/wall/r_wall,
-/area/station/security/evidence)
"vHG" = (
/obj/structure/table/wood,
/obj/machinery/keycard_auth/directional/south,
@@ -62065,6 +62013,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/commons/locker)
+"vMF" = (
+/obj/structure/filingcabinet/security{
+ pixel_x = 4
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"vML" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -62566,6 +62524,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"vVO" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/commons/locker)
"vVV" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -63409,9 +63373,10 @@
/turf/open/floor/iron,
/area/station/security/brig)
"wki" = (
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/turf/open/floor/wood,
-/area/station/service/library)
+/obj/effect/spawner/random/vending/snackvend,
+/obj/machinery/newscaster/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/central)
"wkv" = (
/obj/structure/railing{
dir = 8
@@ -63964,6 +63929,11 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port)
+"wvB" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"wvP" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/machinery/iv_drip,
@@ -63994,6 +63964,16 @@
/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"wwC" = (
+/obj/structure/closet{
+ name = "Evidence Closet 4"
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"wwW" = (
/obj/effect/turf_decal/trimline/purple/line{
dir = 1
@@ -64797,6 +64777,20 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
+"wNp" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/bedsheet/dorms,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/landmark/start/hangover,
+/obj/machinery/button/door/directional/west{
+ id = "Cabin6";
+ name = "Cabin Bolt Control";
+ normaldoorcontrol = 1;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet,
+/area/station/commons/dorms)
"wND" = (
/obj/effect/turf_decal/arrows/red{
dir = 4
@@ -66133,12 +66127,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/circuit/red,
/area/station/ai_monitored/turret_protected/ai_upload)
-"xlW" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/commons/locker)
"xmb" = (
/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{
dir = 4
@@ -67244,6 +67232,14 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain/private)
+"xFA" = (
+/obj/structure/closet/secure_closet/evidence,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/turf_decal/tile/red/half/contrasted{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"xFF" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line{
@@ -67773,6 +67769,10 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
+"xPP" = (
+/obj/item/bodypart/l_leg,
+/turf/open/floor/plating/airless,
+/area/station/science/ordnance/bomb)
"xQb" = (
/obj/machinery/light/directional/east,
/obj/structure/filingcabinet,
@@ -89617,7 +89617,7 @@ sVY
hlu
rSk
sVY
-wki
+bla
cWr
ecO
rFB
@@ -90914,7 +90914,7 @@ sVY
sVY
sVY
sVY
-uxV
+wki
xxk
ahr
bMY
@@ -94197,7 +94197,7 @@ mtG
uyd
ltt
mLv
-tHj
+pGr
iMs
cJj
cJj
@@ -94450,11 +94450,11 @@ ajq
lAM
osw
lAM
-vHE
-qmP
-qmP
-qmP
-kaP
+fnz
+eQr
+eQr
+eQr
+ojJ
tjh
rQS
xqI
@@ -94707,11 +94707,11 @@ gkn
lAM
aaa
aaa
-vHE
-jrQ
-jWi
-nBW
-dSY
+fnz
+oXb
+rsL
+uEt
+eJa
aeq
aeq
anl
@@ -94964,13 +94964,13 @@ gkn
aaa
aaa
aaa
-vHE
-sfV
-tLI
-kVM
-eMM
+fnz
+gbx
+nhA
+wvB
+gfC
anl
-njT
+uGH
apJ
lDe
qGQ
@@ -95221,11 +95221,11 @@ lMJ
lMJ
lMJ
lMJ
-vHE
-bAq
-jVj
-dlF
-kGX
+fnz
+xFA
+aVt
+wwC
+vMF
aeq
iRG
apJ
@@ -97102,7 +97102,7 @@ ebV
dZb
ebV
fma
-iFN
+itb
sck
iwA
sck
@@ -97116,7 +97116,7 @@ cId
rQl
oIg
wBq
-eAy
+neA
vKW
jNX
jxW
@@ -98140,7 +98140,7 @@ bBo
gwf
gfZ
gqm
-buI
+jZP
cDA
jrb
lkL
@@ -100390,7 +100390,7 @@ jAO
ejX
qXV
eVz
-xlW
+vVO
sNJ
hWF
rxc
@@ -103856,7 +103856,7 @@ kJi
hxV
xhh
xhh
-uVj
+xPP
grw
kJi
kJi
@@ -104368,7 +104368,7 @@ aaf
kJi
kJi
coc
-eLW
+qIa
xhh
xhh
iYD
@@ -104482,10 +104482,10 @@ tgo
lOU
nmI
lnc
-tCM
+sBa
mPu
lnc
-utJ
+avU
iee
lnc
crL
@@ -106024,19 +106024,19 @@ kZq
gNh
aTD
lnc
-fsu
+bmz
cKC
lnc
-eJU
+lxf
obw
qXB
icS
qXB
-fZp
+wNp
sGh
lnc
obw
-dAy
+rUo
lqQ
fzr
iCJ
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 3d4626ad6d9..f55423499f7 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -57293,13 +57293,13 @@
/area/station/service/chapel/office)
"qmz" = (
/obj/structure/rack,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 8
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -5
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 6
},
/obj/structure/window/reinforced,
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 4acd13dbb77..d6782165f31 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -2293,19 +2293,6 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
-"aZL" = (
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/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/evidence)
"aZX" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 1
@@ -4120,6 +4107,19 @@
},
/turf/open/floor/wood/large,
/area/station/service/library)
+"bFG" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 5
+ },
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 8
+ },
+/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/evidence)
"bFT" = (
/obj/machinery/light/small/directional/east,
/turf/open/openspace,
@@ -6459,17 +6459,6 @@
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/iron,
/area/station/engineering/main)
-"crI" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/light/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"crL" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
@@ -8738,18 +8727,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/grass,
/area/station/medical/virology)
-"dfy" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/xeno_spawn,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"dfz" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
@@ -10040,16 +10017,6 @@
/obj/effect/turf_decal/trimline/neutral/filled/line,
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
-"dAd" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/filled/line,
-/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/evidence)
"dAh" = (
/obj/structure/cable,
/turf/open/floor/iron/dark/telecomms,
@@ -12991,9 +12958,6 @@
},
/turf/open/floor/iron/grimy,
/area/station/service/library/lounge)
-"eDe" = (
-/turf/closed/wall/r_wall,
-/area/station/security/evidence)
"eDk" = (
/obj/machinery/light/dim/directional/north,
/obj/effect/turf_decal/trimline/dark_green/corner{
@@ -13133,9 +13097,6 @@
},
/turf/open/floor/engine/air,
/area/station/engineering/atmos)
-"eFe" = (
-/turf/closed/wall,
-/area/station/security/evidence)
"eFk" = (
/obj/structure/table,
/obj/item/stack/sheet/rglass{
@@ -13349,6 +13310,16 @@
/obj/structure/cable,
/turf/open/floor/iron/grimy,
/area/station/security/detectives_office)
+"eIY" = (
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/effect/turf_decal/trimline/red/filled/corner{
+ dir = 4
+ },
+/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,
+/area/station/security/office)
"eJi" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
@@ -18523,15 +18494,6 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
-"gGu" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"gGy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22407,6 +22369,9 @@
/obj/effect/turf_decal/trimline/purple/filled/corner,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
+"ibu" = (
+/turf/closed/wall/r_wall,
+/area/station/security/evidence)
"ica" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -24156,6 +24121,16 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/science/xenobiology)
+"iIg" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/obj/item/storage/secure/safe/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"iIm" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -25807,14 +25782,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit/departure_lounge)
-"joj" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"jop" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/wideplating/corner{
@@ -25876,6 +25843,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/research)
+"jpn" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"jpp" = (
/obj/structure/window/reinforced/spawner/north,
/obj/structure/window/reinforced/spawner/east,
@@ -27640,6 +27615,16 @@
/obj/effect/spawner/random/bureaucracy/pen,
/turf/open/floor/iron,
/area/station/commons/fitness)
+"jWe" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/red/filled/line,
+/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/evidence)
"jWk" = (
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
@@ -28051,13 +28036,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
-"kdO" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kdT" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -28166,17 +28144,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/turf/open/floor/iron,
/area/station/security/execution/transfer)
-"kfy" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"kfz" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28598,6 +28565,21 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/station/hallway/primary/tram/left)
+"kmb" = (
+/obj/machinery/door/airlock/security{
+ name = "Evidence Storage"
+ },
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"kme" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/purple/filled/corner{
@@ -30823,6 +30805,17 @@
/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
/turf/open/floor/iron/grimy,
/area/station/ai_monitored/turret_protected/aisat/foyer)
+"kZA" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"kZK" = (
/obj/effect/turf_decal/trimline/white/line{
dir = 4
@@ -35694,6 +35687,9 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/engineering/gravity_generator)
+"mIW" = (
+/turf/closed/wall,
+/area/station/security/evidence)
"mIZ" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -39675,21 +39671,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/cargo/storage)
-"ois" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/spray/pestspray{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/item/reagent_containers/spray/plantbgone,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 9
- },
-/obj/item/reagent_containers/cup/bottle/nutrient/ez,
-/obj/item/reagent_containers/cup/bottle/nutrient/rh,
-/obj/item/reagent_containers/cup/watering_can,
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
"oiw" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -43298,6 +43279,18 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/ai_monitored/command/storage/eva)
+"pxe" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/xeno_spawn,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"pxg" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -46588,38 +46581,6 @@
},
/turf/open/floor/engine/cult,
/area/station/service/library)
-"qEM" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/clothing/head/helmet/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/item/shield/riot{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/shield/riot,
-/obj/item/shield/riot{
- pixel_x = 3;
- pixel_y = -3
- },
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
"qEW" = (
/obj/structure/table,
/obj/item/stack/sheet/iron/fifty,
@@ -47292,16 +47253,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/engineering/supermatter/room)
-"qPC" = (
-/obj/effect/turf_decal/trimline/red/filled/corner,
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 4
- },
-/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,
-/area/station/security/office)
"qPG" = (
/obj/machinery/telecomms/bus/preset_three,
/turf/open/floor/iron/dark/telecomms,
@@ -48937,12 +48888,6 @@
"rvr" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
-"rvu" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"rvD" = (
/obj/machinery/camera/directional/west{
c_tag = "Hallway - Service Wing Right Stairway"
@@ -51214,21 +51159,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
-"sgh" = (
-/obj/machinery/door/airlock/security{
- name = "Evidence Storage"
- },
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"sgu" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
@@ -52992,6 +52922,38 @@
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
+"sPQ" = (
+/obj/structure/rack,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/item/shield/riot{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/shield/riot,
+/obj/item/shield/riot{
+ pixel_x = 3;
+ pixel_y = -3
+ },
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/ai_monitored/security/armory)
"sPX" = (
/obj/machinery/chem_dispenser,
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -53049,6 +53011,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/genetics)
+"sQH" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"sRh" = (
/obj/structure/showcase/cyborg/old{
pixel_y = 20
@@ -57876,6 +57844,13 @@
/obj/structure/lattice,
/turf/open/space/basic,
/area/space/nearstation)
+"uBK" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"uBN" = (
/obj/machinery/holopad/secure,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -59091,6 +59066,17 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/nuke_storage)
+"uZo" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/red/filled/line{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"uZs" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8
@@ -60333,6 +60319,21 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"vwh" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/spray/pestspray{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 9
+ },
+/obj/item/reagent_containers/cup/bottle/nutrient/ez,
+/obj/item/reagent_containers/cup/bottle/nutrient/rh,
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/iron,
+/area/station/service/hydroponics/garden)
"vwn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
@@ -65066,6 +65067,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/freezer,
/area/station/security/prison/shower)
+"xfr" = (
+/obj/structure/closet{
+ name = "Evidence Closet 1"
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/security/evidence)
"xfx" = (
/obj/machinery/computer/atmos_alert{
dir = 8
@@ -67081,16 +67091,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison)
-"xUx" = (
-/obj/structure/closet{
- name = "Evidence Closet 1"
- },
-/obj/item/storage/secure/safe/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
"xUy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -146907,7 +146907,7 @@ bbb
wdU
jNb
ckM
-ois
+vwh
jBy
iHr
mpw
@@ -152763,7 +152763,7 @@ dhe
dhe
dhe
dEv
-qEM
+sPQ
nFM
epT
hgn
@@ -157136,7 +157136,7 @@ ykX
rtK
gYC
sLT
-qPC
+eIY
hhI
uqC
pCU
@@ -157392,11 +157392,11 @@ pqz
tag
oLZ
kvb
-eDe
-sgh
-eFe
-eFe
-eFe
+ibu
+kmb
+mIW
+mIW
+mIW
jKq
pTr
drq
@@ -157649,11 +157649,11 @@ aJk
tag
dLB
dLB
-eDe
-dAd
-kdO
-rvu
-gGu
+ibu
+jWe
+uBK
+sQH
+xfr
jKq
pTr
ohd
@@ -157906,11 +157906,11 @@ tag
tag
hgJ
hga
-eDe
-aZL
-kfy
-dfy
-crI
+ibu
+bFG
+uZo
+pxe
+kZA
jKq
wqu
xrq
@@ -158163,11 +158163,11 @@ dhe
iZb
iBV
dLB
-eDe
-xUx
-rvu
-joj
-rvu
+ibu
+iIg
+sQH
+jpn
+sQH
jKq
awB
pTr
@@ -158420,11 +158420,11 @@ dhe
iZb
iZb
csK
-eDe
-eDe
-eDe
-eDe
-eDe
+ibu
+ibu
+ibu
+ibu
+ibu
rrk
rrk
rrk
@@ -158678,7 +158678,7 @@ iZb
aRN
xXs
aRN
-eFe
+mIW
dhe
dhe
dhe
diff --git a/_maps/shuttles/skyrat/prison_transport.dmm b/_maps/shuttles/skyrat/prison_transport.dmm
index 0caa3a41a8a..80caedee166 100644
--- a/_maps/shuttles/skyrat/prison_transport.dmm
+++ b/_maps/shuttles/skyrat/prison_transport.dmm
@@ -103,10 +103,10 @@
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/suit/armor/riot,
/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
/obj/effect/turf_decal/tile/dark_blue/fourcorners,
/turf/open/floor/iron/dark,
/area/shuttle/prison_transport)
diff --git a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm
index 8669a9f65cc..e5cae400e97 100644
--- a/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm
+++ b/_maps/skyrat/automapper/templates/Skyrat_Map_Reset.dmm
@@ -278,12 +278,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
@@ -636,12 +636,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
@@ -2183,14 +2183,14 @@
"iA" = (
/obj/structure/rack,
/obj/machinery/light/directional/west,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = 2
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 2
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 2
},
@@ -4322,12 +4322,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
@@ -5235,12 +5235,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
index c19fcf7d3ec..744046b52aa 100644
--- a/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
+++ b/_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
@@ -421,12 +421,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm
index 9d12539d38c..c3e3b12c4c9 100644
--- a/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_armory_middle.dmm
@@ -194,12 +194,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
index f3a0e99fbbd..0c967d83344 100644
--- a/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
+++ b/_maps/skyrat/automapper/templates/kilostation/kilostation_armory.dmm
@@ -349,12 +349,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
index d90f168e57f..ccfee5b367b 100644
--- a/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
+++ b/_maps/skyrat/automapper/templates/metastation/metastation_armory.dmm
@@ -272,14 +272,14 @@
"O" = (
/obj/structure/rack,
/obj/machinery/light/directional/west,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = 2
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_y = 2
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 2
},
diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm
index c9b3c4f35ba..473d68a3f7e 100644
--- a/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm
+++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_armory.dmm
@@ -493,12 +493,12 @@
pixel_x = 3;
pixel_y = -3
},
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = -3;
pixel_y = 3
},
-/obj/item/clothing/head/helmet/riot,
-/obj/item/clothing/head/helmet/riot{
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot{
pixel_x = 3;
pixel_y = -3
},
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 0de2091fcd7..33367a432db 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -299,7 +299,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
/obj/item/clothing/gloves/color/black = 1,
/obj/item/clothing/gloves/color/yellow = 1,
/obj/item/clothing/gloves/tackler/combat = 1,
- /obj/item/clothing/head/helmet/justice = 1,
+ /obj/item/clothing/head/helmet/toggleable/justice = 1,
/obj/item/storage/belt/military/assault = 1,
/obj/item/storage/belt/security = 1,
) = 1,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 3f40cb0c9cb..f928bf2403c 100755
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -330,7 +330,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/riot(src)
for(var/i in 1 to 3)
- new /obj/item/clothing/head/helmet/riot(src)
+ new /obj/item/clothing/head/helmet/toggleable/riot(src)
for(var/i in 1 to 3)
new /obj/item/shield/riot(src)
diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm
index 1536b73a714..a9d9fde953e 100644
--- a/code/modules/cargo/packs/security.dm
+++ b/code/modules/cargo/packs/security.dm
@@ -158,7 +158,7 @@
Requires Security access to open."
cost = CARGO_CRATE_VALUE * 6 //justice comes at a price. An expensive, noisy price.
contraband = TRUE
- contains = list(/obj/item/clothing/head/helmet/justice,
+ contains = list(/obj/item/clothing/head/helmet/toggleable/justice,
/obj/item/clothing/mask/gas/sechailer,
)
crate_name = "security clothing crate"
@@ -316,7 +316,7 @@
name = "Riot Helmets Crate"
desc = "Contains three riot helmets. Requires Armory access to open."
cost = CARGO_CRATE_VALUE * 4
- contains = list(/obj/item/clothing/head/helmet/riot = 3)
+ contains = list(/obj/item/clothing/head/helmet/toggleable/riot = 3)
crate_name = "riot helmets crate"
/datum/supply_pack/security/armory/riotshields
@@ -379,6 +379,7 @@
cost = CARGO_CRATE_VALUE * 7
contains = list(/obj/item/storage/belt/holster/thermal = 2)
crate_name = "thermal pistol crate"
+
/datum/supply_pack/security/armory/wt550
name = "Recalled Weapon Pack"
desc = "Contains a set of old Nanotrasen brand autorifles recalled due to choking hazard."
@@ -389,7 +390,7 @@
/obj/item/ammo_box/magazine/wt550m9 = 2,
)
crate_name = "Recalled rifle crate"
-
+
/datum/supply_pack/security/armory/wt550ammo
name = "Recalled Ammo Pack"
desc = "Contains four 20-round magazine for the Recalled WT-550 Auto Rifle. \
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 7436a20005c..5eb464318f1 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -16,11 +16,6 @@
var/visor_flags_cover = 0 //same as above, but for flags_cover
///What to toggle when toggled with weldingvisortoggle()
var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW
- var/alt_desc = null
- var/toggle_message = null
- var/alt_toggle_message = null
- var/toggle_cooldown = null
- var/cooldown = 0
var/clothing_flags = NONE
///List of items that can be equipped in the suit storage slot while we're worn.
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index a799e2d6838..e4ae1b981cb 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -6,7 +6,6 @@
righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi'
body_parts_covered = HEAD
slot_flags = ITEM_SLOT_HEAD
- var/can_toggle = null
///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them.
/obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 318e916cd5c..f3d5098f98d 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -102,35 +102,20 @@
inhand_icon_state = "blueshift_helmet"
custom_premium_price = PAYCHECK_COMMAND
-/obj/item/clothing/head/helmet/riot
- name = "riot helmet"
- desc = "It's a helmet specifically designed to protect against close range attacks."
- icon_state = "riot"
- inhand_icon_state = "riot_helmet"
- toggle_message = "You pull the visor down on"
- alt_toggle_message = "You push the visor up on"
- can_toggle = 1
- armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80, WOUND = 15)
- flags_inv = HIDEEARS|HIDEFACE|HIDESNOUT
- strip_delay = 80
- actions_types = list(/datum/action/item_action/toggle)
- visor_flags_inv = HIDEFACE|HIDESNOUT
- toggle_cooldown = 0
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
- visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
- dog_fashion = null
-/obj/item/clothing/head/helmet/attack_self(mob/user)
+/obj/item/clothing/head/helmet/toggleable
+ dog_fashion = null
+ ///chat message when the visor is toggled down.
+ var/toggle_message
+ ///chat message when the visor is toggled up.
+ var/alt_toggle_message
+
+/obj/item/clothing/head/helmet/toggleable/attack_self(mob/user)
. = ..()
if(.)
return
- if(!can_toggle)
+ if(user.incapacitated() || !try_toggle())
return
-
- if(user.incapacitated() || world.time <= cooldown + toggle_cooldown)
- return
-
- cooldown = world.time
up = !up
flags_1 ^= visor_flags
flags_inv ^= visor_flags_inv
@@ -143,7 +128,26 @@
var/mob/living/carbon/carbon_user = user
carbon_user.head_update(src, forced = TRUE)
-/obj/item/clothing/head/helmet/justice
+///Attempt to toggle the visor. Returns true if it does the thing.
+/obj/item/clothing/head/helmet/toggleable/proc/try_toggle()
+ return TRUE
+
+/obj/item/clothing/head/helmet/toggleable/riot
+ name = "riot helmet"
+ desc = "It's a helmet specifically designed to protect against close range attacks."
+ icon_state = "riot"
+ inhand_icon_state = "riot_helmet"
+ toggle_message = "You pull the visor down on"
+ alt_toggle_message = "You push the visor up on"
+ armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80, WOUND = 15)
+ flags_inv = HIDEEARS|HIDEFACE|HIDESNOUT
+ strip_delay = 80
+ actions_types = list(/datum/action/item_action/toggle)
+ visor_flags_inv = HIDEFACE|HIDESNOUT
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+
+/obj/item/clothing/head/helmet/toggleable/justice
name = "helmet of justice"
desc = "WEEEEOOO. WEEEEEOOO. WEEEEOOOO."
icon_state = "justice"
@@ -151,33 +155,36 @@
toggle_message = "You turn off the lights on"
alt_toggle_message = "You turn on the lights on"
actions_types = list(/datum/action/item_action/toggle_helmet_light)
- can_toggle = 1
- toggle_cooldown = 20
- dog_fashion = null
+ ///Cooldown for toggling the visor.
+ COOLDOWN_DECLARE(visor_toggle_cooldown)
///Looping sound datum for the siren helmet
var/datum/looping_sound/siren/weewooloop
-/obj/item/clothing/head/helmet/justice/Initialize(mapload)
+/obj/item/clothing/head/helmet/toggleable/justice/try_toggle()
+ if(!COOLDOWN_FINISHED(src, visor_toggle_cooldown))
+ return FALSE
+ COOLDOWN_START(src, visor_toggle_cooldown, 2 SECONDS)
+ return TRUE
+
+/obj/item/clothing/head/helmet/toggleable/justice/Initialize(mapload)
. = ..()
weewooloop = new(src, FALSE, FALSE)
-/obj/item/clothing/head/helmet/justice/Destroy()
+/obj/item/clothing/head/helmet/toggleable/justice/Destroy()
QDEL_NULL(weewooloop)
return ..()
-/obj/item/clothing/head/helmet/justice/attack_self(mob/user)
+/obj/item/clothing/head/helmet/toggleable/justice/attack_self(mob/user)
. = ..()
if(up)
weewooloop.start()
else
weewooloop.stop()
-/obj/item/clothing/head/helmet/justice/escape
+/obj/item/clothing/head/helmet/toggleable/justice/escape
name = "alarm helmet"
desc = "WEEEEOOO. WEEEEEOOO. STOP THAT MONKEY. WEEEOOOO."
icon_state = "justice2"
- toggle_message = "You turn off the light on"
- alt_toggle_message = "You turn on the light on"
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index b85ce26e4f0..4648fbd0677 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -2,8 +2,8 @@
// **** Security gas mask ****
// Cooldown times
-#define PHRASE_COOLDOWN 30
-#define OVERUSE_COOLDOWN 180
+#define PHRASE_COOLDOWN (3 SECONDS)
+#define OVERUSE_COOLDOWN (18 SECONDS)
// Aggression levels
#define AGGR_GOOD_COP 1
@@ -57,6 +57,7 @@ GLOBAL_LIST_INIT(hailer_phrases, list(
visor_flags_cover = MASKCOVERSMOUTH
tint = 0
has_fov = FALSE
+ COOLDOWN_DECLARE(hailer_cooldown)
var/aggressiveness = AGGR_BAD_COP
var/overuse_cooldown = FALSE
var/recent_uses = 0
@@ -129,7 +130,7 @@ GLOBAL_LIST_INIT(hailer_phrases, list(
set category = "Object"
set name = "HALT"
set src in usr
- if(!isliving(usr) || !can_use(usr) || cooldown)
+ if(!isliving(usr) || !can_use(usr) || !COOLDOWN_FINISHED(src, hailer_cooldown))
return
if(broken_hailer)
to_chat(usr, span_warning("\The [src]'s hailing system is broken."))
@@ -171,16 +172,12 @@ GLOBAL_LIST_INIT(hailer_phrases, list(
return rand(aggressiveness == AGGR_BROKEN ? BROKE_PHRASES : EMAG_PHRASE + 1, upper_limit)
/obj/item/clothing/mask/gas/sechailer/proc/play_phrase(mob/user, datum/hailer_phrase/phrase)
- . = FALSE
- if (!cooldown)
- usr.audible_message("[usr]'s Compli-o-Nator: [initial(phrase.phrase_text)]")
- playsound(src, "sound/runtime/complionator/[initial(phrase.phrase_sound)].ogg", 100, FALSE, 4)
- cooldown = TRUE
- addtimer(CALLBACK(src, /obj/item/clothing/mask/gas/sechailer/proc/reset_cooldown), PHRASE_COOLDOWN)
- . = TRUE
-
-/obj/item/clothing/mask/gas/sechailer/proc/reset_cooldown()
- cooldown = FALSE
+ if(!COOLDOWN_FINISHED(src, hailer_cooldown))
+ return
+ COOLDOWN_START(src, hailer_cooldown, PHRASE_COOLDOWN)
+ user.audible_message("[user]'s Compli-o-Nator: [initial(phrase.phrase_text)]")
+ playsound(src, "sound/runtime/complionator/[initial(phrase.phrase_sound)].ogg", 100, FALSE, 4)
+ return TRUE
/obj/item/clothing/mask/gas/sechailer/proc/reset_overuse_cooldown()
overuse_cooldown = FALSE
@@ -194,12 +191,14 @@ GLOBAL_LIST_INIT(hailer_phrases, list(
custom_price = PAYCHECK_COMMAND * 1.5
w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/halt)
+ COOLDOWN_DECLARE(whistle_cooldown)
/obj/item/clothing/mask/whistle/ui_action_click(mob/user, action)
- if(cooldown < world.time - 100)
- usr.audible_message("HALT!")
- playsound(src, 'sound/misc/whistle.ogg', 75, FALSE, 4)
- cooldown = world.time
+ if(!COOLDOWN_FINISHED(src, whistle_cooldown))
+ return
+ COOLDOWN_START(src, whistle_cooldown, 10 SECONDS)
+ user.audible_message("HALT!")
+ playsound(src, 'sound/misc/whistle.ogg', 75, FALSE, 4)
/datum/action/item_action/halt
name = "HALT!"
diff --git a/code/modules/mob/living/carbon/human/monkey/monkey.dm b/code/modules/mob/living/carbon/human/monkey/monkey.dm
index ff9b8492895..18953f53ed6 100644
--- a/code/modules/mob/living/carbon/human/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/human/monkey/monkey.dm
@@ -28,7 +28,7 @@
/// Gives our funny monkey an Ape Escape hat reference
/mob/living/carbon/human/species/monkey/angry/proc/give_ape_escape_helmet()
- var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
+ var/obj/item/clothing/head/helmet/toggleable/justice/escape/helmet = new(src)
equip_to_slot_or_del(helmet, ITEM_SLOT_HEAD)
helmet.attack_self(src) // todo encapsulate toggle
diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm
index 02606b5dc23..7ea916ed76f 100644
--- a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm
@@ -21,9 +21,6 @@
/obj/item/clothing/head/hooded/explorer
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-/obj/item/clothing/head/helmet/sec
- supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
-
/obj/item/clothing/head/hats/warden
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi
index cf38cd57d4b..b0173a6c4c2 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/head.dmi
index 01a22b6d9b7..01cd01a19e2 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/head.dmi differ
diff --git a/modular_skyrat/modules/customization/modules/clothing/under/accessories.dm b/modular_skyrat/modules/customization/modules/clothing/under/accessories.dm
index bd0bdb06165..82248d3eef3 100644
--- a/modular_skyrat/modules/customization/modules/clothing/under/accessories.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/under/accessories.dm
@@ -43,7 +43,6 @@
if(isliving(user))
user.visible_message(span_danger("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_danger("You invade [M]'s personal space, thrusting [src] into their face insistently."))
user.do_attack_animation(M)
- cooldown = 30
// Sheriff Badge (toy)
/obj/item/clothing/accessory/badge/sheriff
@@ -61,7 +60,6 @@
if(isliving(user))
user.visible_message(span_danger("[user] invades [M]'s personal space, the sheriff badge into their face!."),span_danger("You invade [M]'s personal space, thrusting the sheriff badge into their face insistently."))
user.do_attack_animation(M)
- cooldown = 30
//.Holobadges.
/obj/item/clothing/accessory/badge/holo
diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
index b85d0543856..5f7571bbb86 100644
--- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
+++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
@@ -190,32 +190,40 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "security_helmet"
- toggle_message = "You pull the visor down on"
- alt_toggle_message = "You push the visor up on"
+ base_icon_state = "security_helmet"
actions_types = list(/datum/action/item_action/toggle)
- can_toggle = TRUE
- toggle_cooldown = 0
supports_variations_flags = CLOTHING_SNOUTED_VARIATION
flags_cover = HEADCOVERSEYES | PEPPERPROOF
visor_flags_cover = HEADCOVERSEYES | PEPPERPROOF
+ dog_fashion = null
-//Need to do some fuckery to make sure the mounted light preserves the current visor instead of throwing a fit sprite-wise
+ ///chat message when the visor is toggled down.
+ var/toggle_message = "You pull the visor down on"
+ ///chat message when the visor is toggled up.
+ var/alt_toggle_message = "You push the visor up on"
+ ///Can toggle?
+ var/can_toggle = TRUE
+
+/// Duplication of toggleable logic - only way to make it toggleable without worse hacks due to being in base maps.
/obj/item/clothing/head/helmet/sec/attack_self(mob/user)
- if(can_toggle && !user.incapacitated())
- if(world.time > cooldown + toggle_cooldown)
- cooldown = world.time
- up = !up
- flags_1 ^= visor_flags
- flags_inv ^= visor_flags_inv
- flags_cover ^= visor_flags_cover
- icon_state = "[initial(icon_state)][up ? "up" : ""]"
- //End of our only change
- to_chat(user, span_notice("[up ? alt_toggle_message : toggle_message] \the [src]."))
+ . = ..()
+ if(.)
+ return
+ if(user.incapacitated() || !can_toggle)
+ return
+ up = !up
+ flags_1 ^= visor_flags
+ flags_inv ^= visor_flags_inv
+ flags_cover ^= visor_flags_cover
+ // This part is changed to work with the seclight.
+ base_icon_state = "[initial(icon_state)][up ? "up" : ""]"
+ update_icon_state()
+ to_chat(user, span_notice("[up ? alt_toggle_message : toggle_message] \the [src]."))
- user.update_worn_head()
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- C.head_update(src, forced = 1)
+ user.update_worn_head()
+ if(iscarbon(user))
+ var/mob/living/carbon/carbon_user = user
+ carbon_user.head_update(src, forced = TRUE)
//Beret replacement
/obj/item/clothing/head/security_garrison
@@ -664,9 +672,10 @@
*/
/obj/item/clothing/head/helmet/sec/redsec
- icon = 'icons/obj/clothing/head/hats.dmi'
- worn_icon = 'icons/mob/clothing/head/hats.dmi'
+ icon = 'icons/obj/clothing/head/helmet.dmi'
+ worn_icon = 'icons/mob/clothing/head/helmet.dmi'
icon_state = "helmet"
+ base_icon_state = "helmet"
actions_types = null
can_toggle = FALSE
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm
index 40f1e8478a2..b51dbf42449 100644
--- a/modular_skyrat/modules/goofsec/code/sol_fed.dm
+++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm
@@ -433,7 +433,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/sunglasses
ears = /obj/item/radio/headset/headset_sec/alt
- head = /obj/item/clothing/head/helmet/riot
+ head = /obj/item/clothing/head/helmet/toggleable/riot
belt = /obj/item/gun/energy/disabler
suit = /obj/item/clothing/suit/armor/riot
r_pocket = /obj/item/lighter
diff --git a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm
index c96c0646fac..9e24a684850 100644
--- a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm
+++ b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm
@@ -60,6 +60,6 @@
new /obj/item/assembly/flash/handheld(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/clothing/shoes/jackboots/peacekeeper(src)
- new /obj/item/clothing/head/helmet/riot(src)
+ new /obj/item/clothing/head/helmet/toggleable/riot(src)
new /obj/item/shield/riot(src)
new /obj/item/clothing/under/rank/security/corrections_officer(src)
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
index 8b7e273d691..8e28b5a6e2b 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
@@ -6,7 +6,9 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "peacekeeper_helmet"
- worn_icon_state = "peacekeeper"
+ base_icon_state = "peacekeeper_helmet"
+ can_toggle = FALSE
+ actions_types = null
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
/obj/item/clothing/head/beret/sec/peacekeeper
diff --git a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm
index 1a0d6ccd75c..ab45b1d56ca 100644
--- a/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm
+++ b/modular_skyrat/modules/sec_haul/code/security_medic/secmed_clothes.dm
@@ -72,8 +72,10 @@
desc = "A standard issue combat helmet for security medics. Has decent tensile strength and armor. Keep your head down."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
- worn_icon_state = "secmed_helmet"
icon_state = "secmed_helmet"
+ base_icon_state = "secmed_helmet"
+ can_toggle = FALSE
+ actions_types = null
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/storage/belt/security/medic
diff --git a/tools/UpdatePaths/Scripts/70773_toggleable_helmets_repath.txt b/tools/UpdatePaths/Scripts/70773_toggleable_helmets_repath.txt
new file mode 100644
index 00000000000..fa15fcd416e
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/70773_toggleable_helmets_repath.txt
@@ -0,0 +1,4 @@
+#comment This repaths the riothelmet and justice helmet to toggleable subtypes. see (https://github.com/tgstation/tgstation/pull/70773)
+
+/obj/item/clothing/head/helmet/riot : /obj/item/clothing/head/helmet/toggleable/riot{@OLD}
+/obj/item/clothing/head/helmet/justice/@SUBTYPES : /obj/item/clothing/head/helmet/toggleable/justice/@SUBTYPES {@OLD}