diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5573ca357814..bb615846bfe6 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -35038,6 +35038,10 @@ /obj/machinery/camera/autoname{ dir = 4 }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -24 + }, /turf/open/floor/plasteel/dark/textured/half{ dir = 1 }, @@ -37274,6 +37278,17 @@ /obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw, /turf/open/floor/plasteel/textured/half, /area/hallway/primary/port) +"dUw" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "armory3" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/box, +/turf/open/floor/plasteel/dark/textured/half, +/area/ai_monitored/security/armory) "dVh" = ( /obj/effect/landmark/start/paramedic, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -53728,6 +53743,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/east, /turf/open/floor/plasteel/textured/large, /area/ai_monitored/security/armory) "kCf" = ( @@ -62833,21 +62852,6 @@ }, /turf/open/floor/plasteel/white/textured/edge, /area/medical/medbay/central) -"opU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters{ - id = "armory3" - }, -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/box, -/turf/open/floor/plasteel/dark/textured/half, -/area/security/office) "oqp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -67346,20 +67350,6 @@ /obj/machinery/computer/slot_machine, /turf/open/floor/plating/damturf/scorched, /area/hallway/secondary/construction) -"qlw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/textured/half{ - dir = 1 - }, -/area/security/office) "qly" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 @@ -69093,8 +69083,16 @@ }, /area/hallway/primary/fore) "qXA" = ( -/obj/machinery/rnd/production/techfab/department/security, /obj/effect/turf_decal/bot/yellow, +/obj/structure/rack, +/obj/item/gun/energy/e_gun/dragnet{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/gun/energy/e_gun/dragnet{ + pixel_x = -2; + pixel_y = 2 + }, /turf/open/floor/plasteel/textured/large, /area/ai_monitored/security/armory) "qXI" = ( @@ -71584,14 +71582,9 @@ /turf/open/floor/wood/wood_diagonal, /area/security/prison/workout) "scv" = ( -/obj/machinery/door/poddoor/shutters{ - id = "armory3" - }, /obj/effect/turf_decal/siding/dark_red{ dir = 1 }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/box, /obj/structure/cable{ icon_state = "4-8" }, @@ -74151,23 +74144,6 @@ }, /turf/open/floor/grass, /area/security/prison/garden) -"tfq" = ( -/obj/structure/rack, -/obj/item/gun/energy/e_gun/dragnet{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/gun/energy/e_gun/dragnet{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/effect/turf_decal/bot/yellow, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/north, -/turf/open/floor/plasteel/textured/large, -/area/ai_monitored/security/armory) "tfu" = ( /obj/effect/turf_decal/trimline/white/filled/line{ dir = 8 @@ -79610,6 +79586,11 @@ }, /turf/open/floor/plasteel/textured/half, /area/hallway/primary/fore) +"vnx" = ( +/obj/machinery/rnd/production/techfab/department/security, +/obj/effect/turf_decal/bot/yellow, +/turf/open/floor/plasteel/textured/large, +/area/security/office) "vnI" = ( /obj/structure/cable{ icon_state = "4-8" @@ -86259,6 +86240,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel/white/textured/large, /area/science/xenobiology) +"xYj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/door/poddoor/shutters{ + id = "armory3" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/box, +/turf/open/floor/plasteel/dark/textured/half, +/area/ai_monitored/security/armory) "xYx" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 @@ -116240,8 +116236,8 @@ ujI gVK whb kBJ -uQS -vAa +cMT +ggD qXA whb djV @@ -116496,9 +116492,9 @@ whb whb whb whb -tfq -cMT -ggD +whb +dUw +xYj whb whb lzO @@ -116753,9 +116749,9 @@ abI hBb mRj xtN -xtN +vnx scv -opU +ktW xWK sdC gAi @@ -117010,7 +117006,7 @@ otO uRL uRL dbu -qlw +uRL sjX nEc xWK diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f6a7ba00796e..88967b8ec631 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -101480,14 +101480,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/closet/secure_closet/contraband/armory, -/obj/effect/spawner/lootdrop/armory_contraband, -/obj/effect/spawner/lootdrop/armory_contraband, -/obj/effect/spawner/lootdrop/armory_contraband, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" - }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "pKM" = ( @@ -123256,6 +123248,17 @@ /obj/machinery/disposal/bin, /turf/open/floor/wood, /area/command/heads_quarters/hos) +"vRL" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/rnd/production/techfab/department/security, +/obj/machinery/door/window/brigdoor, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Reception Desk"; + req_access_txt = "3" + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/security/armory) "vRV" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -128696,7 +128699,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/rnd/production/techfab/department/security, +/obj/structure/closet/secure_closet/contraband/armory, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" + }, +/obj/effect/spawner/lootdrop/armory_contraband, +/obj/effect/spawner/lootdrop/armory_contraband, +/obj/effect/spawner/lootdrop/armory_contraband, +/obj/effect/spawner/lootdrop/armory_contraband, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "xwf" = ( @@ -186745,7 +186756,7 @@ sXI igv rWs uja -xqe +vRL iBP feL lEu diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 56a78b7ac7b1..04969a3fb0c2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -45359,7 +45359,6 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dhv" = ( -/obj/structure/table/reinforced, /obj/machinery/door/window/westleft{ base_state = "right"; dir = 4; @@ -45374,9 +45373,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/item/folder/red, -/obj/item/folder/red, -/obj/item/poster/random_official, +/obj/machinery/rnd/production/techfab/department/security, /turf/open/floor/plasteel/dark, /area/security/warden) "dhw" = ( @@ -68864,8 +68861,6 @@ /obj/item/gun/energy/ionrifle, /obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/hooded/ablative, -/obj/item/gun/energy/e_gun/dragnet, -/obj/item/gun/energy/e_gun/dragnet, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -71999,7 +71994,9 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/main) "oPH" = ( -/obj/machinery/rnd/production/techfab/department/security, +/obj/structure/rack, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "oPO" = ( diff --git a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm index cd88e771e2c5..b179a9bc3c62 100644 --- a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm +++ b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm @@ -1239,8 +1239,15 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/rnd/production/techfab/department/security, /obj/effect/turf_decal/bot/yellow, +/obj/structure/closet/secure_closet/contraband/armory, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" + }, +/obj/effect/spawner/lootdrop/armory_contraband, +/obj/effect/spawner/lootdrop/armory_contraband, +/obj/effect/spawner/lootdrop/armory_contraband, /turf/open/floor/mineral/plastitanium, /area/ai_monitored/security/armory) "aek" = ( @@ -1294,14 +1301,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/closet/secure_closet/contraband/armory, -/obj/effect/spawner/lootdrop/armory_contraband, -/obj/effect/spawner/lootdrop/armory_contraband, -/obj/effect/spawner/lootdrop/armory_contraband, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" - }, /turf/open/floor/mineral/plastitanium, /area/ai_monitored/security/armory) "aeo" = ( @@ -45779,8 +45778,12 @@ /area/maintenance/starboard/fore) "dcB" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters{ - id = "armory3" +/obj/machinery/rnd/production/techfab/department/security, +/obj/machinery/door/window/brigdoor, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Reception Desk"; + req_access_txt = "3" }, /turf/open/floor/mineral/plastitanium, /area/ai_monitored/security/armory)