diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index c93a660eeb3..49340e999c9 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -3148,7 +3148,10 @@
/turf/simulated/wall,
/area/maintenance/fore2)
"aqq" = (
-/turf/simulated/wall/r_wall/rust,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aqu" = (
/obj/machinery/door/firedoor,
@@ -10936,15 +10939,6 @@
/obj/machinery/seed_extractor,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
-"aGU" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- tag = ""
- },
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
"aGV" = (
/obj/structure/cable{
d1 = 4;
@@ -10955,8 +10949,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aGW" = (
/obj/structure/lattice,
@@ -11567,13 +11563,16 @@
"aIl" = (
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIm" = (
/obj/item/reagent_containers/glass/bucket,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/hydroponics/constructable,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIn" = (
/obj/structure/cable{
@@ -11582,20 +11581,25 @@
icon_state = "1-2";
tag = ""
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIo" = (
/obj/item/plant_analyzer,
/obj/machinery/hydroponics/constructable,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIp" = (
/obj/item/cultivator,
/obj/item/reagent_containers/spray/pestspray,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aIq" = (
/obj/machinery/atmospherics/unary/portables_connector,
@@ -12221,8 +12225,12 @@
/area/security/permabrig)
"aJC" = (
/obj/structure/table,
+/obj/item/book/manual/chef_recipes,
/obj/item/clothing/head/chefhat,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aJD" = (
/obj/item/twohanded/required/kirbyplants,
@@ -12852,11 +12860,10 @@
},
/obj/structure/table,
/obj/machinery/computer/library/public,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aKS" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aKT" = (
/obj/structure/cable{
@@ -12882,7 +12889,10 @@
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"aKU" = (
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aKV" = (
/obj/machinery/status_display{
@@ -13553,9 +13563,13 @@
},
/area/ai_monitored/storage/eva)
"aMq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/obj/structure/chair/stool{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aMu" = (
/obj/structure/cable{
@@ -13563,9 +13577,14 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aMv" = (
/turf/simulated/wall/r_wall,
@@ -14072,7 +14091,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
+ },
/area/security/permabrig)
"aNE" = (
/obj/structure/cable{
@@ -14086,24 +14108,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aNF" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aNG" = (
@@ -14112,14 +14119,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNI" = (
/obj/structure/cable{
@@ -14139,36 +14148,10 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aNJ" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aNK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aNL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14182,7 +14165,10 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNM" = (
/obj/structure/cable{
@@ -14197,8 +14183,8 @@
dir = 4
},
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aNN" = (
@@ -14207,27 +14193,40 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/item/storage/box/donkpockets,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aNP" = (
/obj/machinery/light/small{
dir = 4
},
-/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aNQ" = (
/obj/machinery/light/small{
@@ -14240,7 +14239,6 @@
name = "EXTERNAL AIRLOCK";
pixel_x = -32
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -14683,16 +14681,23 @@
/turf/space,
/area/space/nearstation)
"aOX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/ai_status_display{
- pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
},
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aOY" = (
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/unary/outlet_injector/on{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aOZ" = (
/obj/structure/cable{
@@ -14703,40 +14708,48 @@
/obj/structure/table,
/obj/item/paper,
/obj/item/pen,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
-"aPa" = (
-/obj/structure/chair/stool,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aPb" = (
-/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/mouse,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/mob/living/simple_animal/mouse,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aPd" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "redcorner"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aPe" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aPf" = (
/obj/machinery/alarm{
dir = 8;
pixel_x = 24
},
-/obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aPg" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -14777,8 +14790,18 @@
},
/area/security/execution)
"aPj" = (
-/turf/simulated/wall/r_wall/rust,
-/area/security/execution)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/permabrig)
"aPk" = (
/obj/machinery/door/poddoor{
id_tag = "turbinevent";
@@ -14917,9 +14940,9 @@
},
/area/crew_quarters/bar)
"aPv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
/area/security/permabrig)
"aPw" = (
/obj/effect/landmark/start{
@@ -15437,23 +15460,31 @@
/turf/simulated/floor/plating,
/area/maintenance/gambling_den)
"aQx" = (
-/obj/structure/table,
-/obj/item/book/manual/chef_recipes,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aQy" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQB" = (
/obj/structure/table,
-/turf/simulated/floor/plating,
+/obj/item/toy/figure/crew/syndie,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQC" = (
/obj/structure/cable{
@@ -15463,26 +15494,41 @@
},
/obj/structure/table,
/obj/item/deck/cards,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQD" = (
-/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
+/obj/structure/chair/stool{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aQG" = (
/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ icon_state = "redcorner"
+ },
/area/security/permabrig)
"aQH" = (
/obj/machinery/computer/cryopod{
pixel_y = -32
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aQI" = (
/obj/machinery/cryopod,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aQJ" = (
/turf/simulated/floor/plasteel{
@@ -16200,57 +16246,55 @@
},
/area/hallway/primary/fore)
"aSh" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/syringe,
+/obj/machinery/computer/security{
+ dir = 4;
+ network = list("SS13","Research Outpost","Mining Outpost")
+ },
/turf/simulated/floor/plasteel{
dir = 9;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aSi" = (
-/obj/structure/table/glass,
-/obj/item/folder/blue,
-/obj/item/healthanalyzer,
/obj/machinery/light{
dir = 1;
on = 1
},
-/obj/machinery/newscaster{
- pixel_y = 32
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aSj" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine,
-/obj/item/reagent_containers/syringe,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
/turf/simulated/floor/plasteel{
dir = 5;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aSl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/security/permabrig)
-"aSm" = (
-/obj/machinery/light/small,
-/obj/item/twohanded/required/kirbyplants,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/ai_status_display{
- pixel_y = -32
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
},
-/turf/simulated/floor/plasteel,
/area/security/permabrig)
"aSn" = (
-/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/obj/structure/chair/stool{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"aSp" = (
/obj/structure/cable{
@@ -16273,13 +16317,19 @@
/obj/machinery/ai_status_display{
pixel_y = -32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aSs" = (
/obj/machinery/computer/arcade{
dir = 1
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aSt" = (
/obj/effect/spawner/window/reinforced,
@@ -16667,7 +16717,10 @@
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aTc" = (
/obj/structure/cable{
@@ -16934,28 +16987,40 @@
},
/area/quartermaster/qm)
"aTF" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/sunglasses/blindfold,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/computer/area_atmos/area{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aTG" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"aTH" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/sunglasses/blindfold,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching Prison Wing holding areas.";
+ name = "Prison Monitor";
+ network = list("Prison");
+ pixel_x = 30
+ },
/turf/simulated/floor/plasteel{
dir = 4;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aTI" = (
@@ -17825,23 +17890,29 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
/turf/simulated/floor/plasteel{
dir = 8;
- icon_state = "whitered"
+ icon_state = "red"
},
/area/security/permabrig)
"aVl" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/machinery/door/window/brigdoor{
+ dir = 8;
+ name = "Riot Control";
+ req_access_txt = "2"
},
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = 24
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
},
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitered"
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 1
},
+/turf/simulated/floor/plating,
/area/security/permabrig)
"aVm" = (
/obj/structure/bed,
@@ -17856,7 +17927,6 @@
/area/security/permabrig)
"aVn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -17877,7 +17947,10 @@
network = list("SS13","Security")
},
/obj/structure/chair/stool,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aVp" = (
/obj/structure/cable{
@@ -17885,7 +17958,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
@@ -17927,7 +17999,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "neutral"
+ },
/area/security/permabrig)
"aVt" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -17942,7 +18017,6 @@
network = list("SS13","Security")
},
/obj/structure/chair/stool,
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -18698,20 +18772,21 @@
},
/area/quartermaster/qm)
"aWK" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/regular,
+/obj/structure/table,
+/obj/item/wrench,
+/obj/item/screwdriver,
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "whitered"
+ dir = 10;
+ icon_state = "red"
},
/area/security/permabrig)
"aWL" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "whitered"
+/obj/machinery/portable_atmospherics/canister/sleeping_agent,
+/obj/structure/window/reinforced{
+ dir = 8
},
+/turf/simulated/floor/plating,
/area/security/permabrig)
"aWM" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -18721,18 +18796,19 @@
id = "Cell 1";
pixel_x = -22
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
},
/area/security/permabrig)
"aWN" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/newscaster{
pixel_y = -32
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aWO" = (
/obj/structure/table,
@@ -18751,7 +18827,10 @@
id = "Cell 2";
pixel_x = -22
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aWQ" = (
/obj/structure/cable{
@@ -19454,25 +19533,33 @@
},
/area/quartermaster/qm)
"aYk" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
- d2 = 2;
- icon_state = "0-2"
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
},
-/turf/simulated/floor/plating,
/area/security/permabrig)
"aYl" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
- id_tag = null;
- name = "Brig Medical Bay";
- req_one_access_txt = "63"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "whitehall"
+ icon_state = "red"
},
/area/security/permabrig)
"aYo" = (
@@ -20050,7 +20137,10 @@
id = "Cell 3";
pixel_x = -22
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"aZs" = (
/obj/machinery/door/firedoor,
@@ -20207,11 +20297,6 @@
},
/area/security/permabrig)
"aZH" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/cable{
d1 = 2;
d2 = 4;
@@ -20222,11 +20307,6 @@
},
/area/security/permabrig)
"aZI" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -20234,6 +20314,11 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -20245,12 +20330,9 @@
icon_state = "4-8"
},
/obj/structure/cable{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
- },
-/obj/structure/sign/greencross{
- pixel_y = 32
+ icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -20838,7 +20920,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -20862,7 +20943,6 @@
/area/crew_quarters/bar)
"baS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
@@ -21179,16 +21259,12 @@
},
/area/security/permabrig)
"bbs" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
- icon_state = "redcorner"
+ icon_state = "red"
},
/area/security/permabrig)
"bbt" = (
@@ -21879,15 +21955,11 @@
"bcP" = (
/turf/simulated/wall,
/area/hallway/primary/port)
-"bcU" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/red,
-/obj/item/pen,
-/turf/simulated/floor/plasteel,
-/area/security/permabrig)
"bcV" = (
-/obj/machinery/recharger,
-/obj/structure/table/reinforced,
+/obj/structure/rack,
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/clothing/mask/muzzle,
+/obj/item/clothing/glasses/sunglasses/blindfold,
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"bcW" = (
@@ -21917,6 +21989,11 @@
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/plasteel,
/area/security/permabrig)
"bcY" = (
@@ -26324,7 +26401,10 @@
network = list("SS13","Security")
},
/obj/item/reagent_containers/glass/bucket,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"blS" = (
/obj/structure/closet/secure_closet/brigdoc,
@@ -94234,7 +94314,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"eDh" = (
/obj/structure/rack,
@@ -94449,7 +94532,10 @@
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/chili,
/obj/item/seeds/chili,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"ffm" = (
/obj/structure/chair{
@@ -94780,7 +94866,10 @@
/obj/structure/sign/electricshock{
pixel_y = 32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "red"
+ },
/area/security/permabrig)
"giz" = (
/obj/structure/table/glass,
@@ -95136,12 +95225,17 @@
},
/area/medical/virology)
"hch" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+ dir = 8
+ },
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "red"
+ },
/area/security/permabrig)
"hcQ" = (
/obj/structure/bed,
@@ -95338,6 +95432,20 @@
"hJG" = (
/turf/simulated/floor/plasteel/stairs,
/area/medical/research)
+"hLa" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plating,
+/area/security/permabrig)
"hLZ" = (
/obj/structure/table/glass,
/obj/item/hemostat{
@@ -95440,6 +95548,36 @@
icon_state = "showroomfloor"
},
/area/medical/surgery1)
+"hWz" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plating,
+/area/security/permabrig)
+"hZR" = (
+/obj/structure/chair/stool{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/permabrig)
"ibc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -95530,7 +95668,10 @@
/area/atmos)
"ipD" = (
/obj/structure/closet/wardrobe/pjs,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"isz" = (
/obj/structure/cable{
@@ -95539,7 +95680,10 @@
icon_state = "1-2"
},
/obj/machinery/vending/sustenance,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
/area/security/permabrig)
"iuU" = (
/obj/item/twohanded/required/kirbyplants,
@@ -95707,9 +95851,11 @@
/turf/simulated/floor/plasteel,
/area/security/securearmoury)
"iUc" = (
-/obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"iVO" = (
/obj/structure/cable{
@@ -95900,6 +96046,21 @@
icon_state = "dark"
},
/area/security/processing)
+"jBp" = (
+/obj/machinery/door/poddoor{
+ density = 0;
+ icon_state = "open";
+ id_tag = "Prison Gate";
+ name = "Prison Lockdown Blast Doors";
+ opacity = 0
+ },
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/plating,
+/area/security/permabrig)
"jBy" = (
/obj/structure/window/reinforced{
dir = 1;
@@ -95993,6 +96154,15 @@
icon_state = "whitebluecorner"
},
/area/hallway/primary/central)
+"jLu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "redcorner"
+ },
+/area/security/permabrig)
"jLB" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -96075,6 +96245,15 @@
},
/turf/simulated/floor/plasteel,
/area/maintenance/port)
+"keD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
+/area/security/permabrig)
"khY" = (
/obj/structure/cable{
d1 = 1;
@@ -96254,7 +96433,10 @@
icon_state = "1-2"
},
/obj/item/clipboard,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 9;
+ icon_state = "red"
+ },
/area/security/permabrig)
"kRz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -96562,6 +96744,12 @@
icon_state = "grimy"
},
/area/chapel/office)
+"lMo" = (
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
+/area/security/permabrig)
"lVO" = (
/obj/machinery/turretid/lethal{
control_area = "\improper Telecoms Central Compartment";
@@ -96807,14 +96995,16 @@
/turf/simulated/floor/plasteel/airless,
/area/toxins/test_area)
"mtL" = (
-/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
tag = ""
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"mtR" = (
/obj/structure/cable{
@@ -97073,7 +97263,10 @@
"nbE" = (
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/ambrosia,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 6;
+ icon_state = "red"
+ },
/area/security/permabrig)
"ncs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -97150,7 +97343,10 @@
/obj/item/clothing/gloves/botanic_leather,
/obj/item/reagent_containers/spray/pestspray,
/obj/item/reagent_containers/spray/pestspray,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"nit" = (
/obj/structure/cable{
@@ -97164,7 +97360,6 @@
},
/area/security/warden)
"njE" = (
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 1
},
@@ -97207,7 +97402,10 @@
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/orange,
/obj/item/seeds/orange,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"nqC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -97268,7 +97466,10 @@
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"nFN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -97301,14 +97502,18 @@
},
/area/medical/surgery1)
"nHs" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 8;
+ icon_state = "neutralfull"
},
/area/security/permabrig)
"nJr" = (
@@ -97419,6 +97624,19 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
+"oaB" = (
+/obj/effect/spawner/window/reinforced,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/security/permabrig)
"obL" = (
/obj/structure/chair{
dir = 8
@@ -97456,7 +97674,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Perma-Brig General Population West";
dir = 4;
@@ -97466,7 +97683,10 @@
dir = 8;
pixel_x = -24
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "red"
+ },
/area/security/permabrig)
"ohh" = (
/obj/structure/cable{
@@ -97811,6 +98031,13 @@
icon_state = "redfull"
},
/area/security/seceqstorage)
+"pxj" = (
+/obj/machinery/portable_atmospherics/scrubber/huge/stationary,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "red"
+ },
+/area/security/permabrig)
"pAC" = (
/obj/machinery/light/small{
dir = 8
@@ -98041,11 +98268,13 @@
/turf/space,
/area/space)
"qeU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock{
- name = "Bathroom"
+/obj/machinery/ai_status_display{
+ pixel_x = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "red"
},
-/turf/simulated/floor/plating,
/area/security/permabrig)
"qfH" = (
/obj/structure/cable{
@@ -98105,7 +98334,10 @@
"qqW" = (
/obj/structure/table,
/obj/machinery/kitchen_machine/microwave,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"qrT" = (
/turf/simulated/wall/r_wall,
@@ -98319,8 +98551,14 @@
"rbw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plasteel{
- icon_state = "white"
+ dir = 0;
+ icon_state = "red"
},
/area/security/permabrig)
"reo" = (
@@ -98333,8 +98571,8 @@
},
/obj/item/seeds/carrot,
/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "redcorner"
+ dir = 9;
+ icon_state = "red"
},
/area/security/permabrig)
"reH" = (
@@ -98659,14 +98897,16 @@
icon_state = "2-4";
tag = ""
},
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutralfull"
+ },
/area/security/permabrig)
"sak" = (
/obj/structure/table/wood,
@@ -98840,7 +99080,10 @@
"swV" = (
/obj/machinery/hydroponics/constructable,
/obj/item/seeds/glowshroom,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "red"
+ },
/area/security/permabrig)
"sxS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -99068,7 +99311,10 @@
/obj/effect/decal/cleanable/cobweb2,
/obj/item/seeds/tower,
/obj/item/seeds/amanita,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "red"
+ },
/area/security/permabrig)
"tgs" = (
/obj/structure/chair/office/dark,
@@ -99149,10 +99395,11 @@
},
/area/toxins/misc_lab)
"tvq" = (
-/obj/structure/table,
-/obj/item/toy/figure/crew/syndie,
-/obj/item/paper_bin,
-/turf/simulated/floor/plating,
+/obj/machinery/portable_atmospherics/scrubber/huge/stationary,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"tvI" = (
/obj/structure/cable{
@@ -99191,7 +99438,6 @@
/area/security/processing)
"tFK" = (
/obj/item/soap/nanotrasen,
-/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 4
},
@@ -99199,7 +99445,9 @@
/obj/machinery/shower{
pixel_y = 22
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ icon_state = "freezerfloor"
+ },
/area/security/permabrig)
"tFO" = (
/obj/structure/cable{
@@ -99298,6 +99546,14 @@
icon_state = "red"
},
/area/security/warden)
+"tOv" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 6
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
+/area/security/permabrig)
"tOM" = (
/obj/machinery/door/airlock/security/glass{
name = "Solitary Confinement";
@@ -99616,7 +99872,6 @@
/area/medical/surgery2)
"uUu" = (
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt,
/obj/structure/toilet{
pixel_y = 8
},
@@ -99625,7 +99880,7 @@
dir = 8
},
/obj/item/seeds/ambrosia,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel,
/area/security/permabrig)
"uVQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -99747,7 +100002,10 @@
d2 = 2;
icon_state = "1-2"
},
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "redcorner"
+ },
/area/security/permabrig)
"viE" = (
/obj/machinery/power/apc{
@@ -100332,17 +100590,21 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
+/turf/simulated/floor/plasteel{
+ dir = 0;
+ icon_state = "red"
+ },
/area/security/permabrig)
"xda" = (
-/obj/effect/decal/cleanable/dirt,
/obj/item/cultivator,
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
/obj/machinery/firealarm{
pixel_y = 26
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "red"
+ },
/area/security/permabrig)
"xgm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -151706,7 +151968,7 @@ rTE
pcv
aZE
bbo
-bcU
+bcV
bex
bhc
uKI
@@ -152209,7 +152471,7 @@ aaa
abj
ygH
ygH
-aqq
+ygH
yez
mhu
mhu
@@ -152464,17 +152726,17 @@ acF
abj
mkp
aaa
-aqq
-tFK
-qeU
-abQ
-aKS
ygH
+tFK
+kju
+aYk
+qeU
+aJJ
aSh
aTF
aVk
aWK
-aYk
+aJJ
aZH
bbr
bcX
@@ -152724,17 +152986,17 @@ abj
ygH
aJx
nli
-abQ
+bbs
aPv
-ygH
+hWz
aSi
aTG
nHs
rbw
aYl
aZI
-bbs
-aml
+bbv
+jBp
beA
bfW
bLB
@@ -152981,14 +153243,14 @@ aaa
ygH
uUu
kju
-abQ
aKU
-ygH
+tOv
+hLa
aSj
aTH
aVl
aWL
-aYk
+aJA
aZJ
bbt
bdi
@@ -153240,11 +153502,11 @@ xDn
aJx
iUc
aOX
+oaB
+fcg
ygH
ygH
ygH
-aqq
-ygH
ygH
bOc
bbt
@@ -153496,9 +153758,9 @@ aml
kOC
ofZ
aND
-abQ
+jLu
aQx
-aQB
+pxj
aJx
aVm
aWM
@@ -153751,7 +154013,7 @@ qJC
ygH
ygH
ipD
-abQ
+aPe
aNE
aPb
aQy
@@ -154002,24 +154264,24 @@ aaa
aaa
aaa
abj
-aqq
+ygH
reo
aGT
swV
ygH
nFL
-aKU
-aNF
-aKS
-abQ
-aSm
+aPe
+aNG
+keD
+aPe
+aSr
aJx
aVo
aWO
aJx
aZK
bbt
-aqq
+ygH
ygH
aJA
bhh
@@ -154261,13 +154523,13 @@ aaa
abj
ygH
xda
-aGU
+mtL
aIl
aJx
aKR
aMq
aNG
-abQ
+hZR
aSn
aWN
aJx
@@ -154521,12 +154783,12 @@ feV
aGV
aIm
aJJ
-aKS
aKU
-aNF
+aPe
+aNG
aOY
aQB
-aPe
+lMo
aJx
aVm
aWP
@@ -154779,7 +155041,7 @@ rZK
aIn
aKT
aSp
-aSp
+aPj
aNI
aOZ
aQC
@@ -155036,11 +155298,11 @@ eCs
aIo
aJA
aKU
-aKS
-aNJ
-aPa
+aPe
+aNM
aQD
-aKU
+aQD
+lMo
aJx
aVq
aWO
@@ -155294,9 +155556,9 @@ aIp
aJx
aKV
fFd
-aNK
-abQ
-aKU
+aNL
+aPe
+aPe
aTb
aJx
aJx
@@ -155548,12 +155810,12 @@ ygH
tge
eQg
nbE
-aqq
+ygH
njE
eNI
aNL
-aKS
-aKS
+aPe
+aPe
aSr
aJx
aVr
@@ -155807,11 +156069,11 @@ pWQ
ygH
ygH
tvq
-aKU
+aPe
aNM
-aKS
aPe
aPe
+lMo
aTK
aVs
baS
@@ -155819,7 +156081,7 @@ aYq
aZM
bbv
bdd
-aqq
+ygH
aaa
bhh
biG
@@ -156320,12 +156582,12 @@ aaa
aaa
pWQ
qqW
-aKU
+aPe
aJC
aNO
aPe
aQH
-aPj
+aMv
aMv
aMv
aMv
@@ -156577,7 +156839,7 @@ aaa
aaa
ygH
ggp
-aKU
+aqq
hch
aNP
aPf
@@ -157865,7 +158127,7 @@ aaa
aKW
aMv
aMv
-aPj
+aMv
aMv
aMv
aTQ
@@ -157874,7 +158136,7 @@ aWX
aMv
bad
bbH
-aqq
+ygH
abj
aaa
abj
@@ -158383,8 +158645,8 @@ aaa
aaa
aMv
aMv
-aPj
-aPj
+aMv
+aMv
aMv
bda
bbE
diff --git a/code/__DEFINES/footstep.dm b/code/__DEFINES/footstep.dm
index bda71aa4443..65b96577386 100644
--- a/code/__DEFINES/footstep.dm
+++ b/code/__DEFINES/footstep.dm
@@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(clawfootstep, list(
'sound/effects/footstep/lava3.ogg'), 100, 0),
FOOTSTEP_MEAT = list(list(
'sound/effects/meatslap.ogg'), 100, 0),
- FOOTSTEP_GLASS = list(list(
+ FOOTSTEP_GLASS_BAREFOOT = list(list(
'sound/effects/footstep/glassbarefoot1.ogg',
'sound/effects/footstep/glassbarefoot2.ogg',
'sound/effects/footstep/glassbarefoot3.ogg'), 100, 1),
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 1fbb7a34f59..62dabccc88b 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -86,7 +86,7 @@
return ..()
/datum/mind/proc/get_display_key()
- var/clientKey = current?.client.get_display_key()
+ var/clientKey = current?.client?.get_display_key()
return clientKey ? clientKey : key
/datum/mind/proc/transfer_to(mob/living/new_character)
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 4c7c6b76b36..972b050007c 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -55,12 +55,17 @@
sleep(jaunt_in_time)
qdel(holder)
if(!QDELETED(target))
- if(mobloc.density)
+ if(!(target.Move(mobloc)))
for(var/turf/T in orange(7))
- if(T)
- if(target.Move(T))
- break
- target.canmove = 1
+ if(isspaceturf(T))
+ continue
+ if(T && target.Move(T))
+ target.canmove = TRUE
+ return
+ for(var/turf/space/S in orange(7)) //loop for space turfs in case there were no normal ones last loop
+ if(S && target.Move(S))
+ break
+ target.canmove = TRUE //if there are no valid tiles in a range of 7, just let them spawn wherever they are currently
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index a6183c88abc..6aa1e1ce742 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -83,6 +83,10 @@
if(!ishuman(M)) //If target is not a human
return ..()
+ if(!M.mind)
+ to_chat(user, "This being has no soul!")
+ return ..()
+
if(M.has_brain_worms()) //Borer stuff - RR
to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.")
return ..()
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 6fa1e79e764..e5670281f82 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -168,6 +168,9 @@
use_power = IDLE_POWER_USE
return
+/obj/machinery/recharge_station/force_eject_occupant(mob/target)
+ go_out()
+
/obj/machinery/recharge_station/verb/move_eject()
set category = "Object"
set src in oview(1)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 23ba37eb433..c4454baf3c7 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -89,6 +89,15 @@
/obj/machinery/suit_storage_unit/ce/secure
secure = TRUE
+/obj/machinery/suit_storage_unit/rd
+ name = "research director's suit storage unit"
+ suit_type = /obj/item/clothing/suit/space/hardsuit/rd
+ mask_type = /obj/item/clothing/mask/gas
+ req_access = list(ACCESS_RD)
+
+/obj/machinery/suit_storage_unit/rd/secure
+ secure = TRUE
+
/obj/machinery/suit_storage_unit/security
name = "security suit storage unit"
suit_type = /obj/item/clothing/suit/space/hardsuit/security
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index af5c3039ad6..6e25908862c 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -243,18 +243,20 @@
set_ready_state(1)
return
var/h_boost = health_boost
- var/repaired = 0
+ var/repaired = FALSE
if(chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT)
- h_boost *= -2
+ h_boost = 0
+ chassis.take_damage(2, BURN) //short circuiting droids do damage
+ repaired = TRUE
else if(chassis.internal_damage && prob(15))
for(var/int_dam_flag in repairable_damage)
if(chassis.internal_damage & int_dam_flag)
chassis.clearInternalDamage(int_dam_flag)
- repaired = 1
+ repaired = TRUE
break
- if(h_boost<0 || chassis.obj_integrity < chassis.max_integrity)
+ if(chassis.obj_integrity < chassis.max_integrity && h_boost > 0)
chassis.obj_integrity += min(h_boost, chassis.max_integrity-chassis.obj_integrity)
- repaired = 1
+ repaired = TRUE
if(repaired)
if(!chassis.use_power(energy_drain))
STOP_PROCESSING(SSobj, src)
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 6e54adb0c60..340ce0b64f8 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -170,6 +170,10 @@ LIGHTERS ARE IN LIGHTERS.DM
if(flavor_text)
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
+ if(iscarbon(loc))
+ var/mob/living/carbon/C = loc
+ if(C.wear_mask == src) // Don't update if it's just in their hand
+ C.wear_mask_update(src)
set_light(2, 0.25, "#E38F46")
START_PROCESSING(SSobj, src)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 8c64a8456bf..a602a49d6e2 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -284,10 +284,10 @@
var/asleep = 0
var/ab = 0
var/atemp = 0
+
var/turf_count = 0
- for(var/direction in GLOB.cardinal)//Only use cardinals to cut down on lag
- var/turf/T = get_step(src, direction)
+ for(var/turf/T in atmos_adjacent_turfs)
if(istype(T, /turf/space))//Counted as no air
turf_count++//Considered a valid turf for air calcs
continue
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b98e584f465..794ca47df46 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -13,12 +13,8 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(!GLOB.nologevent)
var/rendered = "ATTACK: [text]"
for(var/client/C in GLOB.admins)
- if(R_ADMIN & C.holder.rights)
- if(C.prefs.atklog == ATKLOG_NONE)
- continue
- var/msg = rendered
- if(C.prefs.atklog <= loglevel)
- to_chat(C, msg)
+ if((C.holder.rights & R_ADMIN) && (C.prefs?.atklog <= loglevel))
+ to_chat(C, rendered)
/**
* Sends a message to the staff able to see admin tickets
@@ -629,7 +625,6 @@ GLOBAL_VAR_INIT(nologevent, 0)
*
* Arguments:
* * M - the mob you're checking
- * *
*/
/proc/is_special_character(mob/M)
if(!SSticker.mode)
@@ -640,7 +635,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
var/mob/living/silicon/robot/R = M
if(R.emagged)
return TRUE
- if(M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
+ if(M.mind?.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
return TRUE
return FALSE
diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
index 21c81287a2b..6a290e230aa 100644
--- a/code/modules/client/preference/preferences_toggles.dm
+++ b/code/modules/client/preference/preferences_toggles.dm
@@ -347,7 +347,7 @@
set desc = "Toggles forcing your runechat colour to white"
prefs.toggles2 ^= PREFTOGGLE_2_FORCE_WHITE_RUNECHAT
prefs.save_preferences(src)
- to_chat(src, "Your runechats will [(prefs.toggles2 & PREFTOGGLE_2_FORCE_WHITE_RUNECHAT) ? "no longer" : "now"] be forced to be white.")
+ to_chat(src, "Your runechats will [(prefs.toggles2 & PREFTOGGLE_2_FORCE_WHITE_RUNECHAT) ? "now" : "no longer"] be forced to be white.")
/client/verb/toggle_simple_stat_panel()
set name = "Toggle Simple Status Panel"
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 310bc8a1767..e9df07a8d3c 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -31,6 +31,9 @@
to_chat(M, "[message] ...LAWS UPDATED")
to_chat(M, "
")
+ for(var/player in GLOB.dead_mob_list)
+ to_chat(player, "[M] ([ghost_follow_link(M, player)]) has recieved an ion law:\n'[message]'")
+
if(botEmagChance)
for(var/mob/living/simple_animal/bot/bot in GLOB.machines)
if(prob(botEmagChance))
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index f143b064722..fd687019ffe 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -7,22 +7,30 @@
desc = "Controls a stacking machine... in theory."
density = FALSE
anchored = TRUE
- var/obj/machinery/mineral/stacking_machine/machine = null
+ var/obj/machinery/mineral/stacking_machine/machine
var/machinedir = SOUTHEAST
-/obj/machinery/mineral/stacking_unit_console/New()
- ..()
+/obj/machinery/mineral/stacking_unit_console/Initialize(mapload)
+ . = ..()
machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
if(machine)
- machine.CONSOLE = src
+ machine.console = src
else
- qdel(src)
+ return INITIALIZE_HINT_QDEL
+
+/obj/machinery/mineral/stacking_unit_console/Destroy()
+ if(machine)
+ machine.console = null
+ machine = null
+ return ..()
/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
-
var/obj/item/stack/sheet/s
var/dat
+ if(!machine)
+ return
+
dat += text("Stacking unit console
")
for(var/O in machine.stack_list)
@@ -60,15 +68,20 @@
desc = "A machine that automatically stacks acquired materials. Controlled by a nearby console."
density = TRUE
anchored = TRUE
- var/obj/machinery/mineral/stacking_unit_console/CONSOLE
- var/stk_types = list()
- var/stk_amt = list()
- var/stack_list[0] //Key: Type. Value: Instance of type.
- var/stack_amt = 50; //ammount to stack before releassing
+ var/obj/machinery/mineral/stacking_unit_console/console
+ var/list/stack_list = list() //Key: Type. Value: Instance of type.
+ var/stack_amt = 50 //ammount to stack before releassing
input_dir = EAST
output_dir = WEST
speed_process = TRUE
+/obj/machinery/mineral/stacking_machine/Destroy()
+ QDEL_LIST(stack_list)
+ if(console)
+ console.machine = null
+ console = null
+ return ..()
+
/obj/machinery/mineral/stacking_machine/process()
var/turf/T = get_step(src, input_dir)
if(T)
diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm
index 6959a08e38f..75f4787e7b1 100644
--- a/code/modules/mob/living/carbon/human/species/grey.dm
+++ b/code/modules/mob/living/carbon/human/species/grey.dm
@@ -91,4 +91,6 @@
/datum/species/grey/get_species_runechat_color(mob/living/carbon/human/H)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
- return E.eye_color
+ if(E)
+ return E.eye_color
+ return flesh_color
diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm
index 8b0878f7115..dfab1029958 100644
--- a/code/modules/mob/living/simple_animal/bot/griefsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm
@@ -92,7 +92,8 @@
C.apply_damage(dmg, BRUTE)
if(prob(stun_chance))
C.Weaken(5)
- add_attack_logs(src, C, "sliced")
+ if(dmg)
+ add_attack_logs(src, C, "sliced")
if(declare_arrests)
var/area/location = get_area(src)
if(!spam_flag)
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 10d56a99dc0..86e3a44aa8a 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -46,7 +46,7 @@
/mob/proc/say_dead(message)
if(client)
- if(!client.holder)
+ if(!check_rights(R_ADMIN, FALSE))
if(!GLOB.dsay_enabled)
to_chat(src, "Deadchat is globally muted.")
return
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index a3a4d0c58c4..b36df828017 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -56,22 +56,24 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
/obj/machinery/photocopier/faxmachine/longrange
name = "long range fax machine"
- icon_state = "longfax"
- insert_anim = "longfaxsend"
- receive_anim = "longfaxreceive"
fax_network = "Central Command Quantum Entanglement Network"
long_range_enabled = TRUE
+/obj/machinery/photocopier/faxmachine/longrange/Initialize(mapload)
+ . = ..()
+ add_overlay("longfax")
+
/obj/machinery/photocopier/faxmachine/longrange/syndie
name = "syndicate long range fax machine"
- icon_state = "fax"
- insert_anim = "faxsend"
- receive_anim = "faxsend"
emagged = TRUE
syndie_restricted = TRUE
req_one_access = list(ACCESS_SYNDICATE)
//No point setting fax network, being emagged overrides that anyway.
+/obj/machinery/photocopier/faxmachine/longrange/syndie/Initialize(mapload)
+ . = ..()
+ add_overlay("syndiefax")
+
/obj/machinery/photocopier/faxmachine/longrange/syndie/update_network()
if(department != "Unknown")
GLOB.hidden_departments |= department
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index c9096042e85..53606f2e39b 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, "dna_vault")
if(VAULT_SPEED)
to_chat(H, "You feel very fast and agile.")
- S.speed_mod = -1
+ ADD_TRAIT(H, TRAIT_GOTTAGOFAST, "dna_vault")
if(VAULT_QUICK)
to_chat(H, "Your arms move as fast as lightning.")
H.next_move_modifier = 0.5
diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png
index 93a5426ee4e..f0202fae3a7 100644
Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index ce0beb1b201..80279d8e94c 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/turf/floors/carpet.dmi b/icons/turf/floors/carpet.dmi
index dc26a7ae5f8..e1dc199b7f5 100644
Binary files a/icons/turf/floors/carpet.dmi and b/icons/turf/floors/carpet.dmi differ
diff --git a/icons/turf/floors/carpet_black.dmi b/icons/turf/floors/carpet_black.dmi
index 80e78a1a412..0bae9ac8cf1 100644
Binary files a/icons/turf/floors/carpet_black.dmi and b/icons/turf/floors/carpet_black.dmi differ