diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 47da382cc63..4d6ce14a4b2 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -11730,11 +11730,11 @@ /turf/open/floor/grass, /area/station/hallway/primary/central) "dwi" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 }, +/obj/machinery/photocopier/prebuilt, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) "dwl" = ( @@ -52786,10 +52786,12 @@ /turf/open/floor/wood, /area/station/service/chapel) "phP" = ( -/obj/structure/closet/secure_closet/security, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 2 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) "phT" = ( @@ -78892,8 +78894,8 @@ /area/station/engineering/storage) "wTj" = ( /obj/structure/lattice/catwalk, -/obj/structure/table/reinforced, /obj/item/radio/intercom/directional/south, +/obj/structure/closet/secure_closet/security, /turf/open/openspace, /area/station/security/checkpoint/customs) "wTk" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5cd5b62d2c7..f164f22799d 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -29618,12 +29618,10 @@ "hmS" = ( /obj/structure/cable, /obj/structure/table/reinforced, -/obj/item/crowbar, -/obj/item/restraints/handcuffs, -/obj/machinery/recharger, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/item/storage/fancy/donut_box, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) "hmU" = ( @@ -70057,7 +70055,6 @@ /obj/machinery/firealarm/directional/north{ pixel_x = 4 }, -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, @@ -70065,6 +70062,10 @@ pixel_y = 27; pixel_x = -6 }, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/item/restraints/handcuffs, +/obj/item/crowbar, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) "rsa" = ( @@ -90649,7 +90650,6 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "wru" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/item/radio/intercom/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b44c086ba9b..8c28835a05b 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -12180,7 +12180,6 @@ /turf/open/floor/iron, /area/station/maintenance/port/aft) "dnT" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -29764,6 +29763,10 @@ /obj/structure/table, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/cable, +/obj/item/crowbar{ + pixel_y = 3; + pixel_x = 15 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "isC" = ( @@ -48091,7 +48094,6 @@ }, /area/station/security/brig) "nEV" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/structure/cable, /obj/effect/turf_decal/tile/red/opposingcorners, /obj/machinery/light/directional/north, @@ -48552,6 +48554,7 @@ /obj/machinery/firealarm/directional/south{ pixel_x = 4 }, +/obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "nLE" = ( @@ -50729,11 +50732,11 @@ /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) "opS" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/item/radio/intercom/directional/north, +/obj/machinery/photocopier/prebuilt, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "opU" = ( @@ -59033,13 +59036,20 @@ /area/station/service/chapel/office) "qEK" = ( /obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/pen{ pixel_x = -3; pixel_y = 4 }, -/obj/item/pen, /obj/structure/table, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/cable, +/obj/item/radio/off{ + pixel_y = 4; + pixel_x = 8 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "qEM" = ( @@ -61763,17 +61773,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "rqi" = ( -/obj/item/crowbar{ - pixel_y = 3 - }, /obj/item/assembly/flash/handheld{ pixel_x = -19; pixel_y = 3 }, /obj/structure/table, /obj/effect/turf_decal/tile/red/anticorner/contrasted, -/obj/item/radio/off{ - pixel_y = 6 +/obj/machinery/fax{ + fax_name = "Custom's Fax Machine"; + name = "Custom's Fax Machine" }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) @@ -65577,7 +65585,6 @@ }, /obj/machinery/newscaster/directional/west, /obj/machinery/light/directional/west, -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7ea0939214e..6dd76840945 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2430,7 +2430,7 @@ "aSQ" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; + pixel_x = -7; pixel_y = 5 }, /obj/machinery/light_switch/directional/north, @@ -2438,6 +2438,10 @@ dir = 1 }, /obj/machinery/light/small/directional/west, +/obj/machinery/recharger{ + pixel_y = 6; + pixel_x = 6 + }, /turf/open/floor/iron, /area/station/security/checkpoint/customs) "aST" = ( @@ -40736,6 +40740,9 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/item/radio, +/obj/item/crowbar, +/obj/item/assembly/flash, /turf/open/floor/iron, /area/station/security/checkpoint/customs) "oay" = ( @@ -62307,10 +62314,8 @@ "vrP" = ( /obj/structure/cable, /obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_y = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/item/storage/fancy/donut_box, /turf/open/floor/iron, /area/station/security/checkpoint/customs) "vsG" = ( @@ -62379,7 +62384,6 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "vtn" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/effect/mapping_helpers/requests_console/supplies, /obj/effect/mapping_helpers/requests_console/assistance, @@ -62387,6 +62391,7 @@ department = "Security"; name = "Security Requests Console" }, +/obj/machinery/photocopier/prebuilt, /turf/open/floor/iron, /area/station/security/checkpoint/customs) "vtp" = ( @@ -63929,13 +63934,16 @@ /area/station/command/bridge) "vSs" = ( /obj/machinery/airalarm/directional/west, -/obj/structure/closet, -/obj/item/crowbar, -/obj/item/assembly/flash/handheld, -/obj/item/radio, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, +/obj/item/toy/figure/ian{ + pixel_x = -4; + pixel_y = 13 + }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 2 + }, /turf/open/floor/iron, /area/station/security/checkpoint/customs) "vSu" = ( diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 22bb773e86f..b8c71b869f7 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -53137,8 +53137,9 @@ /turf/open/floor/iron/white, /area/station/science/lobby) "hRb" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/box/red, +/obj/vehicle/ridden/secway, +/obj/item/key/security, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) "hRc" = ( @@ -96976,9 +96977,10 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 6 }, -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/structure/cable, +/obj/item/key/security, +/obj/vehicle/ridden/secway, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) "otz" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index ae88f4dcae9..be85fead0ff 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -17759,6 +17759,18 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"ffh" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/neutral/filled/warning{ + dir = 1 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "ffL" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29261,6 +29273,9 @@ /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 }, +/obj/effect/turf_decal/arrows/red{ + pixel_y = 15 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "jrg" = ( @@ -53036,6 +53051,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"rDu" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "rDI" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -55793,8 +55814,9 @@ /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat/foyer) "sAc" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/table, +/obj/item/storage/fancy/donut_box, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) "sAd" = ( @@ -62908,11 +62930,12 @@ /turf/open/floor/iron, /area/station/service/janitor) "uUs" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 }, /obj/structure/sign/clock/directional/north, +/obj/structure/closet/secure_closet/security/engine, +/obj/item/clothing/mask/whistle, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) "uUB" = ( @@ -70068,11 +70091,9 @@ /turf/open/floor/iron, /area/station/hallway/secondary/service) "xzn" = ( -/obj/structure/closet/secure_closet/security/engine, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 }, -/obj/item/clothing/mask/whistle, /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) @@ -188178,8 +188199,8 @@ noI kOf aDN wzg -tiM -qSm +ffh +qFH tIk aGb aGb @@ -188950,7 +188971,7 @@ fam aDN wzg tiM -qFH +rDu nQq qSm sJx