diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index cf0db9c20a..881eefc384 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -5,10 +5,10 @@ "aae" = (/obj/structure/lattice,/obj/structure/grille/broken,/obj/machinery/shield_diffuser,/turf/space,/area/space) "aaf" = (/obj/structure/lattice,/turf/space,/area/space) "aag" = (/obj/machinery/vending/fitness{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) -"aah" = (/turf/space,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/construction/firstdeck/construction5) -"aai" = (/turf/space,/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/item/weapon/tool/wirecutters,/turf/simulated/floor/tiled,/area/construction/firstdeck/construction5) +"aah" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/space,/turf/simulated/floor/tiled,/area/construction/firstdeck/construction5) +"aai" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/item/weapon/tool/wirecutters,/turf/space,/turf/simulated/floor/tiled,/area/construction/firstdeck/construction5) "aaj" = (/obj/effect/landmark{name = "bluespacerift"},/turf/space,/area/space) -"aak" = (/turf/space,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/toilet/firstdeck) +"aak" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/space,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/toilet/firstdeck) "aal" = (/obj/machinery/shield_diffuser,/turf/simulated/floor/airless,/area/hallway/primary/firstdeck/auxdockfore) "aam" = (/obj/machinery/door/firedoor/glass,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/firstdeck/auxdockfore) "aan" = (/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/effect/landmark{name = "maint_pred"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) @@ -16,7 +16,7 @@ "aap" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/catwalk,/obj/effect/landmark{name = "maint_pred"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) "aaq" = (/obj/machinery/ai_status_display{pixel_y = 32},/obj/structure/table,/turf/simulated/floor/holofloor/wood,/area/construction/firstdeck) "aar" = (/turf/simulated/floor/holofloor/wood,/area/construction/firstdeck) -"aas" = (/turf/space,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/toilet/firstdeck) +"aas" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/space,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/toilet/firstdeck) "aat" = (/obj/machinery/camera/network/civilian{c_tag = "CIV - Station Gym"},/turf/simulated/floor/plating,/area/construction/firstdeck) "aau" = (/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/plating,/area/construction/firstdeck) "aav" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1379; id_tag = "d1fore_port2_pump"},/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel_dirty,/area/hallway/primary/firstdeck/auxdockfore) @@ -71,9 +71,9 @@ "abs" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/light{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "abt" = (/obj/effect/shuttle_landmark{base_area = /area/space; base_turf = /turf/space; landmark_tag = "d1_near_nw"; name = "Near SC - Deck 1 North West"},/turf/space,/area/space) "abu" = (/obj/machinery/seed_storage/xenobotany{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/machinery/camera/network/research{c_tag = "SCI - Xenoflora Starboard"; dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"abv" = (/turf/space,/obj/structure/table/glass,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/item/weapon/weldingtool,/obj/item/clothing/head/welding,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/techfloor,/area/rnd/xenobiology) +"abv" = (/obj/structure/table/glass,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/item/weapon/weldingtool,/obj/item/clothing/head/welding,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/space,/turf/simulated/floor/tiled/techfloor,/area/rnd/xenobiology) "abw" = (/obj/structure/stairs/spawner/east,/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/fore) -"abx" = (/turf/space,/obj/structure/table/glass,/obj/item/weapon/surgical/scalpel{pixel_y = 12},/obj/item/weapon/surgical/circular_saw,/obj/machinery/camera/network/research{c_tag = "SCI - Xenobiology Fore Starboard"; dir = 4},/obj/effect/floor_decal/corner_steel_grid{dir = 5},/obj/effect/floor_decal/spline/plain{dir = 1},/turf/simulated/floor/tiled,/area/rnd/xenobiology) +"abx" = (/obj/structure/table/glass,/obj/item/weapon/surgical/scalpel{pixel_y = 12},/obj/item/weapon/surgical/circular_saw,/obj/machinery/camera/network/research{c_tag = "SCI - Xenobiology Fore Starboard"; dir = 4},/obj/effect/floor_decal/corner_steel_grid{dir = 5},/obj/effect/floor_decal/spline/plain{dir = 1},/turf/space,/turf/simulated/floor/tiled,/area/rnd/xenobiology) "aby" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_1_hatch"; locked = 1; name = "Escape Pod 1 Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station) "abz" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{id_tag = "d1fore_starboard_airlock"; pixel_x = -26; req_access = null; tag_airpump = "d1fore_starboard_pump"; tag_chamber_sensor = "d1fore_starboard_sensor"; tag_exterior_door = "d1fore_starboard_outer"; tag_interior_door = "d1fore_starboard_inner"},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1379; id_tag = "d1fore_starboard_pump"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) "abA" = (/obj/machinery/airlock_sensor{id_tag = "d1fore_starboard_sensor"; pixel_x = 25},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1379; id_tag = "d1fore_starboard_pump"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) @@ -84,7 +84,7 @@ "abF" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/maintenance/firstdeck/foreport) "abG" = (/obj/machinery/newscaster{layer = 3.3; pixel_y = -27},/turf/simulated/floor/tiled,/area/construction/firstdeck) "abH" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled,/area/construction/firstdeck) -"abI" = (/turf/space,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/purple/border{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research/firstdeck/hallway) +"abI" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/purple/border{dir = 8},/obj/machinery/light{dir = 8},/turf/space,/turf/simulated/floor/tiled/white,/area/rnd/research/firstdeck/hallway) "abJ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/construction/firstdeck) "abK" = (/obj/structure/closet/hydrant{pixel_x = -32},/obj/item/clothing/glasses/meson,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fore_emergency) "abL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fore_emergency) @@ -106,10 +106,10 @@ "acb" = (/turf/simulated/wall,/area/storage/emergency_storage/firstdeck/fore_emergency) "acc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Emergency Storage"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fore_emergency) "acd" = (/obj/machinery/newscaster,/turf/simulated/wall/r_wall,/area/storage/emergency_storage/firstdeck/fore_emergency) -"ace" = (/turf/space,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/door/window/brigdoor/southright{name = "Containment Pen"; req_access = list(47)},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology) +"ace" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/door/window/brigdoor/southright{name = "Containment Pen"; req_access = list(47)},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/space,/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology) "acf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/fore) "acg" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) -"ach" = (/turf/space,/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/remote/blast_door{id = "xenobio6station"; name = "Containment Blast Doors"; pixel_y = 4; req_access = list(55)},/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology) +"ach" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/remote/blast_door{id = "xenobio6station"; name = "Containment Blast Doors"; pixel_y = 4; req_access = list(55)},/turf/space,/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology) "aci" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/landmark{name = "maint_pred"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "acj" = (/obj/effect/overmap/visitable/sector/Southern_Cross,/turf/space,/area/space) "ack" = (/obj/effect/landmark{name = "maint_pred"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) @@ -136,15 +136,15 @@ "acF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/window/reinforced,/obj/machinery/vending/snack{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/elevator) "acG" = (/obj/machinery/door/airlock/glass{name = "Escape Pod"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/tiled/steel_grid,/area/hallway/secondary/escape/firstdeck/ep_aftstarboard) "acH" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/vending/fitness{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/elevator) -"acI" = (/turf/space,/obj/effect/floor_decal/corner_steel_grid{dir = 10},/obj/effect/floor_decal/spline/plain,/turf/simulated/floor/tiled,/area/rnd/xenobiology) -"acJ" = (/turf/space,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/purple/border{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) +"acI" = (/obj/effect/floor_decal/corner_steel_grid{dir = 10},/obj/effect/floor_decal/spline/plain,/turf/space,/turf/simulated/floor/tiled,/area/rnd/xenobiology) +"acJ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/purple/border{dir = 1},/turf/space,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) "acK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/white/border{dir = 1},/obj/machinery/status_display{layer = 4; pixel_y = 32},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "acL" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/white/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "acM" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/ai_status_display{pixel_y = 32},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/white/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "acN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "acO" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "d1fore_starboard_airlock"; name = "interior access button"; pixel_x = -26; req_access = null},/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) "acP" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) -"acQ" = (/turf/space,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) +"acQ" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/turf/space,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) "acR" = (/obj/machinery/computer/crew{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/medical/first_aid_station/firstdeck) "acS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "acT" = (/obj/machinery/vending/cigarette{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/elevator) @@ -158,7 +158,7 @@ "adb" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "adc" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "add" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/vending/snack{dir = 1},/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/port) -"ade" = (/turf/space,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/random/mob/mouse,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) +"ade" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/random/mob/mouse,/turf/space,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "adi" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "adj" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) "adk" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/fore) @@ -542,7 +542,7 @@ "amv" = (/obj/random/mob/mouse,/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) "amw" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "amK" = (/turf/simulated/floor/tiled,/area/hangar/three) -"amN" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"amN" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/machinery/light,/obj/item/weapon/gun/energy/floragun,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "amO" = (/obj/machinery/atmospherics/pipe/manifold4w/visible,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "amP" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 1},/obj/machinery/meter,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "amQ" = (/obj/machinery/atmospherics/unary/heater{dir = 8; icon_state = "heater"},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/rnd/xenobiology/xenoflora_isolation) @@ -591,7 +591,7 @@ "aok" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/monotile,/area/hangar/three) "aol" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled/dark,/area/rnd/research/firstdeck/hallway) "aom" = (/obj/machinery/status_display,/turf/simulated/wall,/area/rnd/xenobiology/xenoflora) -"aon" = (/obj/machinery/smartfridge,/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/rnd/xenobiology/xenoflora) +"aon" = (/obj/structure/disposalpipe/segment,/obj/machinery/smartfridge/produce,/turf/simulated/wall,/area/rnd/xenobiology/xenoflora) "aoo" = (/obj/structure/reagent_dispensers/watertank,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "aop" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/camera/network/research{c_tag = "SCI - Xenoflora Isolation Aft"; dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "aoq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/fore) @@ -910,7 +910,7 @@ "ayv" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/syringes,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "ayx" = (/obj/structure/table/glass,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/tape_roll,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "ayy" = (/obj/structure/closet/crate/hydroponics/prespawned,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"ayz" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"ayz" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/item/device/multitool,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "ayA" = (/obj/structure/closet/emcloset/legacy,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "ayC" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 6},/obj/machinery/meter,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "ayD" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "Port to Isolation"},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 2f38c192cf..664a0a6710 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -5452,7 +5452,7 @@ "dpQ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/aft) "dsj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "crglockdown"; name = "Cargo Lockdown"; opacity = 0},/turf/simulated/floor/plating,/area/maintenance/cargo) "dso" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/hallway/secondary/entry/D1) -"dtI" = (/obj/machinery/smartfridge,/turf/simulated/wall/r_wall,/area/hydroponics) +"dtI" = (/obj/machinery/smartfridge/produce,/turf/simulated/wall/r_wall,/area/hydroponics) "dtN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/aft) "dtR" = (/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/locker) "duc" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) @@ -6179,7 +6179,7 @@ "lKa" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/apcenter) "lKy" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/storage/emergency_storage/seconddeck/as_emergency) "lKT" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/green/border,/obj/machinery/light,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 8},/obj/structure/closet/emcloset,/turf/simulated/floor/tiled,/area/crew_quarters/seconddeck/gym) -"lLj" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/lime/bordercorner,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor/tiled/hydro,/area/hydroponics) +"lLj" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/lime/bordercorner,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/closet/secure_closet/hydroponics,/obj/item/weapon/gun/energy/floragun,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "lLl" = (/obj/random/obstruction,/turf/simulated/floor/plating,/area/maintenance/research) "lLD" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/button/windowtint{id = "cryo_tint"; pixel_x = 36; pixel_y = 6},/obj/machinery/light_switch{name = "light switch "; pixel_x = 36; pixel_y = -6},/turf/simulated/floor/tiled/white,/area/medical/cryo) "lMn" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/aft) @@ -6357,7 +6357,7 @@ "nPc" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/ai_status_display{pixel_x = -32},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2) "nPX" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/ai_status_display{pixel_x = -32},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "nRd" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/carpet,/area/library) -"nSd" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lime/border{dir = 4},/obj/machinery/light{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor/tiled/hydro,/area/hydroponics) +"nSd" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lime/border{dir = 4},/obj/machinery/light{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/secure_closet/hydroponics,/obj/item/device/multitool,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "nSe" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D3) "nSw" = (/obj/machinery/light/small,/obj/effect/floor_decal/industrial/loading{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D2/arrivals) "nSC" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/rnd/mixing) diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index e56982baba..1f53096add 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -2155,7 +2155,7 @@ "vJf" = (/obj/structure/bed/chair,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/bridge) "vJX" = (/obj/machinery/power/terminal,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/maintenance/substation/dorms) "vKr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/cafeteria) -"vLA" = (/obj/machinery/smartfridge,/turf/simulated/wall,/area/crew_quarters/coffee_shop) +"vLA" = (/obj/machinery/smartfridge/produce,/turf/simulated/wall,/area/crew_quarters/coffee_shop) "vMd" = (/obj/item/stack/material/glass{amount = 15},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/wood,/area/maintenance/thirddeck/dormsaft) "vMA" = (/turf/simulated/wall,/area/maintenance/thirddeck/aftport) "vMB" = (/obj/structure/catwalk,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsport) diff --git a/vorestation.dme b/vorestation.dme index 18ea40fb0d..027bd0b5be 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4271,13 +4271,13 @@ #include "maps\southern_cross\items\clothing\sc_under.dm" #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" +#include "maps\southern_cross\loadout\loadout_vr.dm" #include "maps\southern_cross\overmap\shuttles.dm" #include "maps\southern_cross\structures\closets\engineering.dm" #include "maps\southern_cross\structures\closets\medical.dm" #include "maps\southern_cross\structures\closets\misc.dm" #include "maps\southern_cross\structures\closets\research.dm" #include "maps\southern_cross\structures\closets\security.dm" -#include "maps\southern_cross\loadout\loadout_vr.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\engine_submaps\engine.dm" #include "maps\submaps\engine_submaps\engine_areas.dm"