diff --git a/maps/offmap_vr/om_ships/salamander.dmm b/maps/offmap_vr/om_ships/salamander.dmm index e07e28b36ff..933058d6c67 100644 --- a/maps/offmap_vr/om_ships/salamander.dmm +++ b/maps/offmap_vr/om_ships/salamander.dmm @@ -300,10 +300,6 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_head) "fh" = ( -/obj/structure/closet/walllocker{ - name = "Personal Locker"; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -312,6 +308,9 @@ /obj/item/clothing/under/utility, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "fn" = ( @@ -383,12 +382,11 @@ /obj/item/weapon/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, -/obj/structure/closet/walllocker{ - name = "Voidsuit Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "gl" = ( @@ -477,10 +475,6 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "hn" = ( -/obj/structure/closet/walllocker{ - name = "Personal Locker"; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -492,6 +486,9 @@ /obj/item/clothing/under/utility, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "hp" = ( @@ -657,11 +654,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, @@ -678,6 +670,9 @@ /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/snack, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "jT" = ( @@ -907,11 +902,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, @@ -926,14 +916,12 @@ /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/snack, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "mJ" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, @@ -948,14 +936,12 @@ /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/snack, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "mO" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/machinery/light, /obj/random/firstaid, /obj/random/firstaid, @@ -968,6 +954,9 @@ /obj/random/drinkbottle, /obj/random/drinkbottle, /obj/random/snack, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "mR" = ( @@ -1169,15 +1158,12 @@ /area/shuttle/salamander_q2) "qu" = ( /obj/structure/table/steel, -/obj/structure/closet/walllocker{ - dir = 1; - pixel_y = -32 - }, /obj/machinery/light_switch{ dir = 8; pixel_x = -22 }, /obj/random/pizzabox, +/obj/structure/closet/walllocker_double/kitchen/south, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_galley) "qx" = ( @@ -1314,11 +1300,6 @@ /turf/simulated/floor/plating, /area/shuttle/salamander) "xL" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Personal Locker"; - pixel_y = -32 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1332,14 +1313,12 @@ /obj/item/clothing/under/utility, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "yv" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Personal Locker"; - pixel_y = -32 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1354,6 +1333,9 @@ /obj/item/clothing/under/utility, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "zO" = ( @@ -1403,10 +1385,6 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_q2) "Bf" = ( -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/machinery/light{ dir = 1 }, @@ -1422,6 +1400,9 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/snack, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "BW" = ( @@ -1527,17 +1508,15 @@ /obj/item/weapon/tank/air, /obj/item/clothing/suit/space/void/refurb, /obj/item/clothing/head/helmet/space/void/refurb, -/obj/structure/closet/walllocker{ - dir = 1; - name = "Voidsuit Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "IQ" = ( @@ -1597,10 +1576,6 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "KX" = ( -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/random/tech_supply/nofail, /obj/random/tech_supply/nofail, @@ -1614,6 +1589,9 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/snack, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "Lf" = ( @@ -1727,10 +1705,6 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/random/tech_supply/component/nofail, /obj/random/tech_supply/component/nofail, @@ -1744,6 +1718,9 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/snack, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "RO" = ( @@ -1813,11 +1790,6 @@ /turf/simulated/wall/shull, /area/shuttle/salamander_head) "Tl" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Voidsuit Locker"; - pixel_y = -32 - }, /obj/item/device/suit_cooling_unit, /obj/item/weapon/tank/air, /obj/item/clothing/suit/space/void/refurb, @@ -1834,6 +1806,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "TG" = ( @@ -1933,10 +1908,6 @@ /turf/simulated/floor/plating, /area/shuttle/salamander) "Xc" = ( -/obj/structure/closet/walllocker{ - name = "Voidsuit Locker"; - pixel_y = 32 - }, /obj/item/device/suit_cooling_unit, /obj/item/weapon/tank/air, /obj/item/clothing/suit/space/void/refurb, @@ -1951,16 +1922,15 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "Xn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/random/tech_supply/nofail, /obj/random/tech_supply/nofail, @@ -1974,6 +1944,9 @@ /obj/random/drinksoft, /obj/random/drinksoft, /obj/random/snack, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander) "Xr" = ( diff --git a/maps/offmap_vr/om_ships/salamander_wreck.dmm b/maps/offmap_vr/om_ships/salamander_wreck.dmm index 4a04546adc7..a3d0e732bfd 100644 --- a/maps/offmap_vr/om_ships/salamander_wreck.dmm +++ b/maps/offmap_vr/om_ships/salamander_wreck.dmm @@ -316,14 +316,13 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck_head) "fh" = ( -/obj/structure/closet/walllocker{ - name = "Personal Locker"; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, /obj/item/stack/cable_coil, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "fn" = ( @@ -396,12 +395,11 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "fZ" = ( -/obj/structure/closet/walllocker{ - name = "Voidsuit Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -497,10 +495,6 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "hn" = ( -/obj/structure/closet/walllocker{ - name = "Personal Locker"; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -508,6 +502,9 @@ dir = 1 }, /obj/item/weapon/circuitboard/smes, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "hp" = ( @@ -682,15 +679,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, /obj/random/empty_or_lootable_crate, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -940,44 +935,38 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, /obj/random/empty_or_lootable_crate, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 }, /area/shuttle/salamander_wreck) "mJ" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, /obj/random/empty_or_lootable_crate, /obj/item/weapon/smes_coil, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 }, /area/shuttle/salamander_wreck) "mO" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Cargo Locker"; - pixel_y = -32 - }, /obj/random/empty_or_lootable_crate, /obj/machinery/light/flicker, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1195,14 +1184,11 @@ /area/shuttle/salamander_wreck_q2) "qu" = ( /obj/structure/table/steel, -/obj/structure/closet/walllocker{ - dir = 1; - pixel_y = -32 - }, /obj/machinery/light_switch{ dir = 8; pixel_x = -22 }, +/obj/structure/closet/walllocker_double/kitchen/south, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1336,11 +1322,6 @@ /turf/simulated/floor/plating, /area/shuttle/salamander_wreck) "xL" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Personal Locker"; - pixel_y = -32 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1350,14 +1331,12 @@ dir = 4 }, /obj/item/weapon/tank/phoron/pressurized, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "yv" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Personal Locker"; - pixel_y = -32 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1367,6 +1346,9 @@ dir = 4 }, /obj/machinery/light/flicker, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "zO" = ( @@ -1426,14 +1408,13 @@ }, /area/shuttle/salamander_wreck_q2) "Bf" = ( -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/machinery/light{ dir = 1 }, /obj/random/empty_or_lootable_crate, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1553,17 +1534,15 @@ /turf/simulated/floor/airless, /area/shuttle/salamander_wreck_engineering) "IL" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Voidsuit Locker"; - pixel_y = -32 - }, /obj/structure/handrail{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1627,12 +1606,11 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "KX" = ( -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/random/empty_or_lootable_crate, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1768,13 +1746,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/random/empty_or_lootable_crate, /obj/item/weapon/smes_coil, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1859,11 +1836,6 @@ /turf/simulated/wall/shull, /area/shuttle/salamander_wreck_head) "Tl" = ( -/obj/structure/closet/walllocker{ - dir = 1; - name = "Voidsuit Locker"; - pixel_y = -32 - }, /obj/structure/railing/grey{ dir = 8 }, @@ -1876,6 +1848,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -1985,10 +1960,6 @@ /turf/simulated/floor/airless, /area/shuttle/salamander_wreck) "Xc" = ( -/obj/structure/closet/walllocker{ - name = "Voidsuit Locker"; - pixel_y = 32 - }, /obj/structure/railing/grey{ dir = 8 }, @@ -1999,6 +1970,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0 @@ -2008,12 +1982,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/closet/walllocker{ - name = "Cargo Locker"; - pixel_y = 32 - }, /obj/structure/handrail, /obj/random/empty_or_lootable_crate, +/obj/structure/closet/walllocker_double/north{ + name = "Storage Locker" + }, /turf/simulated/floor/tiled/techfloor{ nitrogen = 0; oxygen = 0