diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index f9b99336c0..8c49169831 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -871,6 +871,7 @@ "aRa" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/green/bordercorner{dir = 1},/obj/machinery/light/spot{dir = 8},/turf/simulated/floor/tiled,/area/hangar/two) "aRd" = (/obj/machinery/newscaster{pixel_y = 30},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/blue/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockaft) "aRf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockaft) +"aRh" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{id_tag = "qpdoorin"; name = "Inner Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "aRl" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "exp_sling_hatch"; locked = 1; name = "Carrier Sling Hatch"; req_access = list(); req_one_access = list(5,43,67)},/turf/simulated/shuttle/floor/darkred,/area/shuttle/expoutpost/station) "aRr" = (/obj/machinery/computer/secure_data{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled,/area/security/checkpoint3) "aRs" = (/obj/effect/shuttle_landmark/southern_cross/sling_station,/turf/simulated/shuttle/floor/darkred,/area/shuttle/expoutpost/station) @@ -894,7 +895,6 @@ "aSH" = (/obj/machinery/newscaster,/turf/simulated/wall/r_wall,/area/storage/tech) "aSP" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor,/area/hallway/primary/firstdeck/auxdockaft) "aSU" = (/obj/machinery/shield_diffuser,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1; name = "Dock External Airlock"; req_one_access = list(13)},/obj/effect/map_helper/airlock/door/ext_door,/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/auxdockaft) -"aSV" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "aTh" = (/turf/simulated/wall/r_wall,/area/hallway/primary/firstdeck/auxdockaft) "aTi" = (/obj/machinery/shield_diffuser,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1; name = "Dock External Airlock"; req_one_access = list(13)},/obj/machinery/access_button{master_tag = null; name = "exterior access button"; pixel_x = -27; pixel_y = -7},/obj/effect/map_helper/airlock/button/ext_button,/obj/effect/map_helper/airlock/door/ext_door,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/auxdockaft) "aTj" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) @@ -977,7 +977,7 @@ "aWn" = (/obj/structure/bed/chair/shuttle{dir = 1},/turf/simulated/shuttle/floor/darkred,/area/shuttle/expoutpost/station) "aWq" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_y = -30},/obj/effect/shuttle_landmark/southern_cross/escape_pod3/station,/turf/simulated/shuttle/floor,/area/shuttle/escape_pod3/station) "aWu" = (/obj/structure/bed/chair/shuttle{dir = 1},/obj/machinery/light,/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "exp_sling"; name = "shuttle bay controller"; pixel_y = -26; tag_door = "exp_sling_hatch"},/turf/simulated/shuttle/floor/darkred,/area/shuttle/expoutpost/station) -"aWv" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/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"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) +"aWv" = (/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"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "aWw" = (/turf/space,/turf/simulated/wall/r_wall,/area/hallway/primary/firstdeck/auxdockaft) "aXT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "aYb" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_1_hatch"; locked = 1; name = "Large Escape Pod Hatch 1"; req_access = list(13)},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod1/station) @@ -1046,7 +1046,6 @@ "bDS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/tiled,/area/tcomm/entrance) "bEi" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/quartermaster/storage) "bEm" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Cargo Maintenance"; req_access = list(31)},/turf/simulated/floor/plating,/area/quartermaster/storage) -"bEo" = (/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/floor_decal/industrial/warning/corner{dir = 1},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "bEr" = (/turf/simulated/wall,/area/storage/emergency_storage/firstdeck/fp_emergency) "bFg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/blue/border{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockaft) "bFo" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = null},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fp_emergency) @@ -1108,7 +1107,7 @@ "cfo" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "cfp" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cfU" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/holofloor/tiled/dark,/area/teleporter/firstdeck) -"chy" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{name = "Checkpoint Lockdown"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"chy" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{id_tag = "qpdoorout"; name = "Outer Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "chC" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock{name = "Unisex Restrooms"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "chO" = (/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/aft_emergency) "chQ" = (/obj/structure/sign/directions/engineering{dir = 1; pixel_y = 10},/obj/structure/sign/directions/cargo{dir = 1},/obj/structure/sign/directions/security{dir = 1; pixel_y = -10},/turf/simulated/wall,/area/hallway/primary/firstdeck/auxdockaft) @@ -1169,7 +1168,7 @@ "cFh" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/item/device/radio/intercom/department/security{dir = 8; icon_override = "secintercom"; pixel_x = -21},/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 33},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cGE" = (/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/teleporter/firstdeck) "cHp" = (/obj/structure/bed/chair/sofa{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) -"cIq" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/computer/security{pixel_x = 5; pixel_y = 9},/obj/machinery/button/remote/blast_door{id = "qpwld"; name = "Desk Lockdown"; pixel_x = -4; pixel_y = 24; req_one_access = list(1,19)},/obj/machinery/button/remote/blast_door{id = "qpdld"; name = "Door Lockdown"; pixel_x = 5; pixel_y = 24; req_one_access = list(1,19)},/obj/machinery/button/flasher{pixel_x = 17; pixel_y = 22; req_one_access = list(1,19)},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"cIq" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/computer/security{pixel_x = 5; pixel_y = 9},/obj/machinery/button/remote/blast_door{id = "qpwld"; name = "Desk Lockdown"; pixel_x = -4; pixel_y = 24; req_one_access = list(1,19)},/obj/machinery/button/remote/blast_door{id = "qpdld"; name = "Door Lockdown"; pixel_x = 5; pixel_y = 24; req_one_access = list(1,19)},/obj/machinery/button/flasher{id = "gatewaycheckpointflash"; name = "Gateway Checkpoint flasher button"; pixel_x = 17; pixel_y = 22; req_one_access = list(1,19)},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cIr" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/green/bordercorner,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cJx" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage) "cLm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/vending/nifsoft_shop,/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/elevator) @@ -1244,9 +1243,9 @@ "dAK" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/computer/shutoff_monitor{dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/engineering/auxiliary_engineering) "dBE" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora_isolation) "dBI" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/steel_grid,/area/hallway/primary/firstdeck/ascenter) -"dDr" = (/obj/machinery/flasher,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/monotile,/area/teleporter/firstdeck) +"dDr" = (/obj/machinery/flasher{id = "gatewaycheckpointflash"; name = "Gateway Checkpoint Mounted flash"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/monotile,/area/teleporter/firstdeck) "dEi" = (/obj/effect/floor_decal/spline/fancy,/obj/machinery/camera/network/security{c_tag = "CP - Lounge"; dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) -"dEs" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = null},/obj/machinery/alarm{pixel_y = 22},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) +"dEs" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = null},/obj/machinery/alarm{pixel_y = 22},/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) "dFO" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = null},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fp_emergency) "dGO" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/effect/floor_decal/corner_steel_grid{dir = 5},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "dHq" = (/obj/structure/catwalk,/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fp_emergency) @@ -1637,7 +1636,7 @@ "fHj" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/button/remote/blast_door{id = "xenobio3station"; name = "Containment Blast Doors"; pixel_y = 4; req_access = list(55)},/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology) "fHQ" = (/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) "fHV" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/corner/green/border{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/aft) -"fID" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Checkpoint Lockdown"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"fID" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{id_tag = "qpdoorout"; name = "Outer Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "fKj" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/aft) "fKK" = (/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) "fKT" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) @@ -2436,7 +2435,7 @@ "qqv" = (/obj/effect/landmark/start{name = "Shaft Miner"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/turf/simulated/floor/tiled/steel,/area/quartermaster/mininglockerroom) "qra" = (/obj/effect/floor_decal/borderfloorblack{dir = 9},/obj/effect/floor_decal/industrial/danger{dir = 9},/turf/simulated/floor/tiled/techfloor/grid,/area/hallway/primary/firstdeck/elevator) "qrc" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Exploration Locker Room Access"; req_one_access = null},/turf/simulated/floor/plating,/area/hangar/lockerroomtwo) -"qrm" = (/obj/structure/closet/secure_closet/guncabinet{req_one_access = null},/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) +"qrm" = (/obj/structure/closet/secure_closet/guncabinet{req_one_access = null},/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "qrp" = (/obj/machinery/atmospherics/valve/digital/open{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "qsN" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "qtc" = (/obj/machinery/newscaster,/turf/simulated/wall/r_wall,/area/hallway/primary/firstdeck/elevator) @@ -2612,6 +2611,7 @@ "szm" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/purple/border{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) "sAo" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor/westleft{name = "Containment Pen"; req_access = list(47)},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology) "sAE" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/door/window/brigdoor/eastright{name = "Containment Pen"; req_access = list(47)},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio2station"; name = "Containment Blast Doors"; opacity = 0},/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology) +"sDV" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{id_tag = "qpdoorin"; name = "Inner Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "sEo" = (/mob/living/simple_mob/slime/xenobio,/turf/simulated/floor/reinforced,/area/rnd/xenobiology) "sEE" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) "sER" = (/obj/structure/catwalk,/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) @@ -3160,14 +3160,14 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHoaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaClaClaHqaHUaIzaJaaJaaJaaJkaJaaJaaJaaJtaJyaJzantaJAaJPaJSaKmaKnaKtaKHaKJaKKaKOaKPaKOaKKaKZantantaCdaLaaLeaGkaGkaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaafaHnaHnaHnaLfaLhaLhaLhaLhaLhaLhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYiaaaaaaaaaaaatOotOoaajaCltOoaiYaiYaiYaaQaaQaaQaiYaiYaiYaiYaiYaiYaiYaiYaaaaClaClaLiaLkaLlaIzaLmaLwaLzaLAaLBaLCaJaaLIaLJaLIaLYaLYaLZaMaaMbantantaaaaaaaaaaMcaMdaMcaaaaaaaaaantabTaLaaMeaMfaGkaGkaaaaaaaaaaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaMhaHnaHnaHnaLfaMiaMvaMDaMvaMFaLhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauXruXruXraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeanaaaaaaaaaaaavYiaafaafaaftOotOoacmaqkiQHpOaaiYaiYagvaMMailaMNaiXaiYaAKaiYaMOaiYaMOaiYaClaClaNhaNlaNoaNqaIzaNraNtaNtaNvaNvaNxaJaaNyaNzaNDaNEaLIaNFaNIaNJantaaaaaaaOhaOhaOhaOiaOhaOhaOhaaaaaaabTaOjaOoaOtaOtaGkaGkabTaMhaMhaOuaOvaOwaOwaOwaOwaOwaPgaOwaOwaOwaOwaOwaPhaOuaMhaMhaPEaQwaQIaRlaRsaRUaRUaRUaSbaLhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauXreaVuXraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYiaaaaaaaaatOoajnajnhSRaMGgpfaiYaiYaSkaMLaSmaSiaiXaiYbrxaiYbrxaiYbrxaiYaSVaTjaTkaTmaTDaTFaIzaTGaNvaTIaNtaNvaNxaJaaTJaTKaTLaTMaLIaTNaUbaUdantaaaaaaaOhaUeaUfaUvaUAaUEaOhaaaaaaabTaOjaUGaUHaUKaVcaVdaVeaMhaVfaVgaVhaViaViaViaVlaVlaVlaVlaVlaViaViaViaVUaVgaVfaMhaWfaWgaWkaLfaWlaWnaWuaWnaMFaLhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYivYivYiaafvYivYiaafvYivYiaVSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYiaaaaaaaaatOoajnajnhSRaMGgpfaiYaiYaSkaMLaSmaSiaiXaiYbrxaiYbrxaiYbrxaiYaauaTjaTkaTmaTDaTFaIzaTGaNvaTIaNtaNvaNxaJaaTJaTKaTLaTMaLIaTNaUbaUdantaaaaaaaOhaUeaUfaUvaUAaUEaOhaaaaaaabTaOjaUGaUHaUKaVcaVdaVeaMhaVfaVgaVhaViaViaViaVlaVlaVlaVlaVlaViaViaViaVUaVgaVfaMhaWfaWgaWkaLfaWlaWnaWuaWnaMFaLhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYivYivYiaafvYivYiaafvYivYiaVSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafvYiaaaaaaaaaaClajnajnajnajnowFaiYaiYcfpcfUdZBgnUhgaaiYsaCsNDxFCcRuaKLaiYaWvaXTaZjaZOaZQaZYaIzbabaNvaNtaNtbaXbbHaJabcWbdcbdBbdGaLIbegbekbegantaaaaaaaOhbeGbfFbfSbfFbhgaOhaaaaaaabTbhjbhnbjkbkkbmqbmGbntbnwaVfaVgaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVbotboCbplbpRbqbaWkaLfaLhaLhaLhaLhaLhaLhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaavYivYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaatOoajnajnriwajniOjaiYaiYsdxkrKbrQbwfbBQaiYwEyjUtpAvelzelzaiYbEobErbErbFobErbEraIzbFybFUaNvaNtaNtbHOaJaaLIbJlaLIbJWaLIajDbLdajDantaaaaaaaOhbLFbMwbONbPdbPTaOhaaaaaabQpbSHbSHbSTbSHbSHbUUbXoaMhbXxaVgaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVcaqcdaaMhcdCcfnaHnaHnaHnaHnaHnaHnaHnaHnvYivYiaafaafvYivYiaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaavYiaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaatOoajnajnriwajniOjaiYaiYsdxkrKbrQbwfbBQaiYwEyjUtpAvelzelzaiYaiIbErbErbFobErbEraIzbFybFUaNvaNtaNtbHOaJaaLIbJlaLIbJWaLIajDbLdajDantaaaaaaaOhbLFbMwbONbPdbPTaOhaaaaaabQpbSHbSHbSTbSHbSHbUUbXoaMhbXxaVgaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVcaqcdaaMhcdCcfnaHnaHnaHnaHnaHnaHnaHnaHnvYivYiaafaafvYivYiaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaavYiaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaFftOoajncfoaiYaiYaiYaiYaiYaiYchyezufIDaiYaiYaiYaiYchCaiYaiYaiYciybErcjEcjGclTcnNaIzcnZcofcoqcpEaNtcpGcpHaLIcpUaLIcqNaLIcrGcsEcsUantaaaaaaaOhcunbfFcuScvFcvHaOhaaaaaabQpcxgcxrcxzcyYbSHczvaMhaMhczGcAKaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVcALcAMaMhcBZaPEcCncCpaPEcDjaPEcEgaWkaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYiaafaafaaftOotOoafNajnaiYcFhcIqmKwcVJgLcuypeKAtiMoBeaiYvHCcXxqiiqhAdVVaiYaiIbErcVAcjGcYgcZtaIzaIzaIzaIzcZVcZVcZVaIzaLYaLYaLYaLYaLYdaRcsEdcdantantaafaOhaOhaOhaOhaOhaOhaOhaafbQpbQpbQpddncxzdetbSHdgHdkjaMhaMhdkRaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVdnCaMhaMhdoidpldpTdpVdteduNdvDdvWaWkaaaaaaaaaaaaaaaaaaaafaaaaaaaaadwhdwndzBdBEdBEdBEdBEdBEdzBaaaaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYivYiaaaaaaaaaaFftOoaFfaFfaiYfMVmMTaamdixwODafVdDrleDvQwaiYjDViTCjTAcOlvOZaiYaiIdFOdHqcjGdIqcZtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadKjdPzdPJdPMdRvdRDdKjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabQpdSccxzcxrdSHdgHdTJaMhdUudUNaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVcaqdVdaMhdVsdVsdVsdVGdVHdVIdVIdVIdVIdVHdVHdVJdVKdVKdVJdVJdVKdVKdVKdVLdVJdzBdVMdVNdVOdVPdVMdzBdzBaafaafaafvYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxrXvYivYivYivYivYivYiaafaafaaaaaaaaaaClaauaVWaiYgMAlcwcysauhwIApsMvpNbMqxdNaiYeSRiTCcGEipWdVVaiYaiIbErdVWdVXcZtcZtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadKjdVYdVZcsEdWaarXdKjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabQpbQpdWbdWdbSHdWedWfaMhdUudWgaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVdWhdVdaMhdVsdWjdWkdWldVHdWmdWpdWqdWrdWGdWMdWrdWNdWOdWPdWQdWrdWqdWSdWTdVHdWUdWVdWYdWVdWYdWVdWZdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxrXaafaaaaaaaafaaaaaaaaaaafsFQaaaaaaaaaaCldXadXbaiYaaAcSKdVTaaGaiYchyiEpfIDaiYaiYakiakPcIrnCBaiYaiYaadbErcZtcZtcZtaaaaaaaaaaaaaaaaaadXfdXfacuacuacudXfdXgdXhdXicsEdXjdXkdXldXmdXndXndXndXmdXmaaaaaaaaaaaaaaaaaabQpbQpbQpbSHdXodXpaMhdXqdXraVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVdXFdXGaMhdXHdXIdXJdXKdVKdXLdXLdXLdXLdXLdXLdXLdXLdXLdXMdXLdXLdXLdXLdXNdVHdXOdXPdXQdXPdXQdXPdXQdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxrXaafaaaaaaaafaaaaaaaaaaafsFQaaaaaaaaaaCldXadXbaiYaaAcSKdVTaaGaiYaRhiEpsDVaiYaiYakiakPcIrnCBaiYaiYaadbErcZtcZtcZtaaaaaaaaaaaaaaaaaadXfdXfacuacuacudXfdXgdXhdXicsEdXjdXkdXldXmdXndXndXndXmdXmaaaaaaaaaaaaaaaaaabQpbQpbQpbSHdXodXpaMhdXqdXraVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVdXFdXGaMhdXHdXIdXJdXKdVKdXLdXLdXLdXLdXLdXLdXLdXLdXLdXMdXLdXLdXLdXLdXNdVHdXOdXPdXQdXPdXQdXPdXQdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYiaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaatOoaFfajEaiYmuZdVQfYUahCaiYrynvpNahFaiYftbvlUiTCdZyaiYaiYajndXUdXVaFfaaaaaaaaaeanaaaaaaacuacudXfdXWdXXdXYdXZdYadYbdYcdYdcsEdYedYfdYjdYkdYldYmdYndYodXmdXndXnaaaaaaeanaaaaaaaaaaCddYtdYudYvaMhdUucaqaVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVcaqdVdaMhdYwdYxdYydYzdYAdYCdYDdYEdYFdYGdYGdZddZedZfdZgdYGdYFdZhdYGdZidZjdZkdZldZndZpdZqdZrdZsdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaatOodZtaTEaiYaiYdZuaiYaiYaiYdZzaaFqQSdVUpKZdZxwBXuXJaiYajnaTEdZFdZHaFfaaaaaaaaaaaaaaaacuacudZJdZKdZLdZMdZNdZOdZPdZQdZRdZSdZTdZUeameaoeapeaqeareaseateaueavdXndXnaaaaaaaaaaaaaaaaCdeaweaxdkjaMhdUucaqaVhaViaVlaVlaVlaVlaVlaVlaVleayaVlaVibnVcaqdVdaMheazeaAeaBeaCdVKeaDeaDeaEeaFeaGeaGeaHeaIeaLeaMeaGeaOeaPeaGeaQeaSeaTeaXeaYebfebgebjecVdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwttOoeehaVWaiYeewbBIpjlqxqaiYfzFgnlabsaiYqjIvIomZrefmaiYafNajnagyefNaFfaaaaaaaaaaaaacuacudZJehpehXehXelZemjemEenSeoheqxerIeseeubeuiewWexseyueyDeyJeBpeBpeCbeavdXndXnaaaaaaaaaaaaaCdeCSdgHaMhaMhaMheESaVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVeEXaMhaMheFTeHoeaBeHMdVJeKQePUeTNePUeTNeVueVQeWceXReZVeTNeTNeTNeTNfaudVHfawfazfaXfazfazfbEfcNdzBaafaafaafvYivYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 09064383ef..08e8f17959 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -14024,7 +14024,7 @@ /area/security/warden) "aSs" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_security{ +/obj/machinery/door/airlock/security{ name = "Warden's Office"; req_access = list(3) }, @@ -14036,7 +14036,13 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, +/obj/machinery/door/blast/shutters{ + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "aSv" = ( @@ -14046,7 +14052,13 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, +/obj/machinery/door/blast/shutters{ + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "aSx" = ( @@ -14758,10 +14770,12 @@ /area/security/prison) "aUu" = ( /obj/machinery/computer/prisoner, -/obj/machinery/newscaster/security_unit{ - pixel_y = 30 - }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 21 + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "aUv" = ( @@ -14784,11 +14798,6 @@ /turf/simulated/floor/wood, /area/rnd/research) "aUx" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, @@ -14807,11 +14816,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/starboard) "aUz" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/table/steel_reinforced, /obj/item/weapon/stamp/denied{ pixel_x = 5 @@ -14829,19 +14833,16 @@ /area/security/warden) "aUA" = ( /obj/structure/closet/secure_closet/warden, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, /obj/machinery/light_switch{ - pixel_x = 36 + pixel_x = 36; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/button/windowtint{ + id = "secward"; + pixel_x = 36; + pixel_y = -6 + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "aUB" = ( @@ -16112,15 +16113,19 @@ /turf/simulated/floor/tiled, /area/security/prison) "aYx" = ( -/obj/item/device/radio/intercom{ - dir = 8; - name = "Station Intercom (General)"; - pixel_x = -21 - }, /obj/machinery/recharger/wallcharger{ pixel_x = -26; pixel_y = 26 }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "aYy" = ( @@ -16429,14 +16434,14 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/seconddeck/ascenter) "aZJ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "aZK" = ( @@ -16480,6 +16485,22 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "security_lockdown"; + name = "Brig Lockdown"; + pixel_x = 26; + pixel_y = 38; + req_access = list(2) + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "Warden_Shutters"; + name = "Privacy Shutters"; + pixel_x = 26; + pixel_y = 27; + req_access = list(2) + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "aZO" = ( @@ -16496,6 +16517,11 @@ /obj/item/weapon/folder/red, /obj/item/weapon/pen, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "aZQ" = ( @@ -18259,12 +18285,10 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "bfG" = ( -/obj/machinery/button/remote/blast_door{ - id = "security_lockdown"; - name = "Brig Lockdown"; - pixel_x = 36; - pixel_y = 18; - req_access = list(2) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/security/warden) @@ -18275,6 +18299,11 @@ req_access = list(3) }, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "bfI" = ( @@ -19603,6 +19632,9 @@ "bjF" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/newscaster/security_unit{ + pixel_x = -30 + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "bjG" = ( @@ -20188,6 +20220,11 @@ }, /obj/item/weapon/hand_labeler, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/tiled/dark, /area/security/warden) "bld" = ( @@ -21895,8 +21932,15 @@ d2 = 8; icon_state = "0-8" }, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "bql" = ( @@ -22967,8 +23011,15 @@ icon_state = "0-4" }, /obj/machinery/door/firedoor/border_only, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "buc" = ( @@ -22981,7 +23032,14 @@ icon_state = "0-8" }, /obj/machinery/door/firedoor/border_only, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "bud" = ( @@ -23064,15 +23122,15 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass_security{ - name = "Warden's Office"; - req_access = list(3) - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/door/airlock/security{ + name = "Warden's Office"; + req_access = list(3) + }, /turf/simulated/floor/tiled/techmaint, /area/security/warden) "buw" = ( @@ -23135,8 +23193,15 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "buE" = ( @@ -23145,8 +23210,15 @@ icon_state = "0-8" }, /obj/structure/cable/green, -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/wingrille_spawn/reinforced/polarized{ + id = "secward" + }, /obj/machinery/door/firedoor/border_only, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "Warden_Shutters"; + name = "Warden Shutters" + }, /turf/simulated/floor/plating, /area/security/warden) "buF" = ( @@ -113242,7 +113314,7 @@ aKU aOb aSr aUv -aZB +bfG aZB bkm bpM @@ -114017,7 +114089,7 @@ aOe aSv aUA aZN -bfG +aZB blb bqh buE diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm index 174d2155c6..83e13ca438 100644 --- a/maps/southern_cross/southern_cross-5.dmm +++ b/maps/southern_cross/southern_cross-5.dmm @@ -332,7 +332,7 @@ "he" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/table/rack,/obj/machinery/camera/network/main_outpost{c_tag = "MO Left Wing - Airlock 1"; dir = 4},/obj/item/weapon/melee/umbrella{color = "#7c0d0d"},/obj/item/weapon/melee/umbrella{color = "#7c0d0d"},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/airlock/left_one) "hf" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor) "hg" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/structure/cable/blue{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/surface/outpost/mining_main) -"hh" = (/obj/structure/closet/secure_closet/guncabinet{req_access = newlist(); req_one_access = list(43,67)},/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/item/weapon/gun/energy/locked/frontier,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration) +"hh" = (/obj/structure/closet/secure_closet/guncabinet{req_access = newlist(); req_one_access = list(43,67)},/obj/effect/floor_decal/corner/purple{dir = 5},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/machinery/light{dir = 1},/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled/dark,/area/surface/outpost/main/exploration) "hi" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/surface/outpost/main/airlock/right_one) "hk" = (/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/brown/border{dir = 1},/obj/structure/table/steel,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled,/area/surface/outpost/mining_main/storage) "hl" = (/obj/machinery/door/airlock/glass_external{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "main7_airlock_exterior"; locked = 1; name = "Main Outpost External"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "main7_airlock_control"; name = "External Access Button"; pixel_y = -26},/turf/simulated/floor/tiled/steel_ridged,/area/surface/outpost/main/airlock/left_two) diff --git a/maps/southern_cross/southern_cross-7.dmm b/maps/southern_cross/southern_cross-7.dmm index 6315bfac7a..8c687b0896 100644 --- a/maps/southern_cross/southern_cross-7.dmm +++ b/maps/southern_cross/southern_cross-7.dmm @@ -2051,11 +2051,11 @@ /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/power/apc/hyper{ coverlocked = 0; - locked = 0; - pixel_y = -24; environ = 0; equipment = 0; - lighting = 0 + lighting = 0; + locked = 0; + pixel_y = -24 }, /obj/structure/cable/green, /turf/simulated/shuttle/plating, @@ -5927,10 +5927,10 @@ }, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier/holdout, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/clothing/accessory/holster/waist, /obj/item/clothing/accessory/holster/waist, /obj/effect/floor_decal/industrial/warning/cee{ @@ -7397,20 +7397,26 @@ }, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier/holdout, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/clothing/accessory/holster/waist, /obj/item/clothing/accessory/holster/waist, /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/item/weapon/gun/energy/locked/frontier/carbine, -/obj/item/weapon/gun/energy/locked/frontier/carbine, +/obj/item/weapon/gun/energy/locked/phasegun/rifle, +/obj/item/weapon/gun/energy/locked/phasegun/rifle, /obj/machinery/light{ dir = 8 }, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, /turf/simulated/shuttle/floor/darkred, /area/shuttle/baby_mammoth) "uJ" = ( @@ -7818,15 +7824,19 @@ }, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun, /obj/effect/floor_decal/corner/green/border{ dir = 4 }, /obj/item/clothing/accessory/holster/waist, /obj/item/clothing/accessory/holster/waist, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled, /area/expoutpost/hangarone) "vD" = ( @@ -7982,14 +7992,18 @@ }, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun, /obj/effect/floor_decal/corner/green/border{ dir = 4 }, /obj/item/clothing/accessory/holster/waist, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled, /area/expoutpost/hangarone) "vS" = ( @@ -14523,12 +14537,16 @@ }, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier/holdout, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/clothing/accessory/holster/waist, /obj/item/clothing/accessory/holster/waist, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, /turf/simulated/shuttle/floor/darkred, /area/shuttle/shuttle3/start) "Tz" = ( diff --git a/modular_chomp/code/modules/economy/cash_register.dm b/modular_chomp/code/modules/economy/cash_register.dm new file mode 100644 index 0000000000..7b4e3366f2 --- /dev/null +++ b/modular_chomp/code/modules/economy/cash_register.dm @@ -0,0 +1,23 @@ +/obj/machinery/cash_register/medical + req_access = list() + req_one_access = list(access_medical,access_heads) + +/obj/machinery/cash_register/engineering + req_access = list() + req_one_access = list(access_engine_equip,access_heads) + +/obj/machinery/cash_register/science + req_access = list() + req_one_access = list(access_tox,access_heads) + +/obj/machinery/cash_register/security + req_access = list() + req_one_access = list(access_brig,access_heads) + +/obj/machinery/cash_register/cargo + req_access = list() + req_one_access = list(access_cargo,access_heads) + +/obj/machinery/cash_register/civilian + req_access = list() + req_one_access = list(access_kitchen,access_bar,access_hydroponics,access_heads) \ No newline at end of file diff --git a/modular_chomp/maps/submaps/shelters/AnimalHospital-20x28.dmm b/modular_chomp/maps/submaps/shelters/AnimalHospital-20x28.dmm index 8a62c1e0df..257a9cc344 100644 --- a/modular_chomp/maps/submaps/shelters/AnimalHospital-20x28.dmm +++ b/modular_chomp/maps/submaps/shelters/AnimalHospital-20x28.dmm @@ -1,11 +1,11 @@ "aH" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "aP" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/toxin,/obj/item/device/laser_pointer,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) -"bc" = (/obj/structure/table/rack/shelf/steel,/obj/item/device/gps,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) +"bc" = (/obj/structure/table/rack/shelf/steel,/obj/item/device/gps,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "cf" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/glass/rag,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "cG" = (/obj/structure/table/standard,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bioregen,/obj/item/weapon/autopsy_scanner,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "cS" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "cX" = (/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"cY" = (/obj/effect/floor_decal/corner/paleblue{dir = 2},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) +"cY" = (/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "dy" = (/obj/structure/sign/redcross{icon_state = "bluecross2"; pixel_y = -31},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "dG" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/door/airlock/medical{req_one_access = null},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "ep" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 4},/obj/structure/bed/chair/comfy/blue{dir = 8},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) @@ -27,8 +27,8 @@ "mC" = (/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "mR" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "mZ" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/structure/bed/chair/comfy/blue{dir = 8},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"nT" = (/obj/structure/table/standard,/obj/item/weapon/surgical/FixOVein{pixel_y = 0; pixel_x = 5},/obj/item/weapon/surgical/bonegel{pixel_x = -5; pixel_y = 2},/obj/item/weapon/surgical/bonesetter{pixel_x = 2},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) -"oa" = (/obj/structure/table/standard,/obj/item/weapon/surgical/hemostat{pixel_y = 0; pixel_x = -4},/obj/item/weapon/surgical/retractor,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) +"nT" = (/obj/structure/table/standard,/obj/item/weapon/surgical/FixOVein{pixel_x = 5},/obj/item/weapon/surgical/bonegel{pixel_x = -5; pixel_y = 2},/obj/item/weapon/surgical/bonesetter{pixel_x = 2},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) +"oa" = (/obj/structure/table/standard,/obj/item/weapon/surgical/hemostat{pixel_x = -4},/obj/item/weapon/surgical/retractor,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "oC" = (/obj/structure/closet,/obj/item/weapon/gun/launcher/syringe,/obj/item/weapon/storage/box/syringegun,/obj/random/cigarettes,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/matches,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/survivalpod/superpose/AnimalHospital) "py" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "qk" = (/obj/structure/table/reinforced,/obj/item/clothing/suit/surgicalapron,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) @@ -38,14 +38,14 @@ "rI" = (/obj/fiftyspawner/titanium,/obj/item/stack/cable_coil/silver,/turf/simulated/floor/plating,/area/survivalpod/superpose/AnimalHospital) "st" = (/obj/machinery/light{dir = 4},/obj/structure/bed/padded,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "su" = (/obj/machinery/door/airlock/multi_tile/glass{name = "Animal Hospital"},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"sI" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/plating,/area/survivalpod/superpose/AnimalHospital) -"sM" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery{pixel_y = 0; pixel_x = 2},/obj/item/weapon/surgical/surgicaldrill,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) +"sI" = (/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/survivalpod/superpose/AnimalHospital) +"sM" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery{pixel_x = 2},/obj/item/weapon/surgical/surgicaldrill,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "sV" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/box/beakers,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "tq" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "vx" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "wc" = (/obj/structure/table/reinforced,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "wm" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"wx" = (/obj/structure/bed/chair/office/dark{dir = 2},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) +"wx" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "wB" = (/obj/machinery/vending/wallmed1/public{pixel_y = 32},/obj/machinery/chem_master,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "wK" = (/obj/structure/morgue,/turf/simulated/floor/plating,/area/survivalpod/superpose/AnimalHospital) "wP" = (/obj/structure/flora/ausbushes/pointybush,/turf/simulated/floor/outdoors/dirt,/area/survivalpod/superpose/AnimalHospital) @@ -56,12 +56,12 @@ "Ab" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/outdoors/dirt,/area/survivalpod/superpose/AnimalHospital) "Ai" = (/obj/structure/noticeboard{dir = 1; pixel_y = -27},/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "Ax" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/regular,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"Bv" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 2},/obj/structure/table/standard,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/melee/baton/cattleprod,/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) +"Bv" = (/obj/effect/floor_decal/corner/paleblue/full,/obj/structure/table/standard,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/melee/baton/cattleprod,/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "BJ" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "BP" = (/obj/structure/closet/secure_closet/medical1{req_access = null},/obj/item/weapon/storage/quickdraw/syringe_case,/obj/item/weapon/storage/quickdraw/syringe_case,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "Cj" = (/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "Di" = (/obj/effect/floor_decal/corner/red/diagonal,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"GG" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) +"GG" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "Hd" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/adv{pixel_y = 5},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "Hl" = (/obj/structure/closet/crate/trashcart,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka,/turf/simulated/floor/outdoors/dirt,/area/survivalpod/superpose/AnimalHospital) "Hn" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/structure/closet/crate/bin{anchored = 1},/obj/item/weapon/lipstick/random,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) @@ -99,7 +99,7 @@ "SH" = (/obj/machinery/vending/snack,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "SY" = (/obj/structure/table/standard,/obj/item/device/taperecorder,/obj/item/weapon/pen/blue{pixel_x = 5; pixel_y = 5},/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/AnimalHospital) "Te" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/light/small,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) -"Tm" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 2},/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) +"Tm" = (/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/space_heater,/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "Vc" = (/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/structure/bed/chair/comfy/blue{dir = 8},/turf/simulated/floor/tiled,/area/survivalpod/superpose/AnimalHospital) "Vr" = (/turf/template_noop,/area/survivalpod/superpose/AnimalHospital) "VV" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/outdoors/dirt,/area/survivalpod/superpose/AnimalHospital) diff --git a/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm b/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm index 01d6f0a59e..f6a2b09efe 100644 --- a/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm +++ b/modular_chomp/maps/submaps/shelters/CrashedInfestedShip-56x25.dmm @@ -64,7 +64,7 @@ "iQ" = (/obj/structure/particle_accelerator/particle_emitter/center{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/CrashedInfestedShip) "jb" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/fire,/obj/fire,/turf/simulated/shuttle/floor/alienplating,/area/survivalpod/superpose/CrashedInfestedShip) "jd" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/item/trash/material/metal,/turf/simulated/shuttle/floor/alien,/area/survivalpod/superpose/CrashedInfestedShip) -"jg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/wall/alien/blue/hard_corner,/area/survivalpod/superpose/CrashedInfestedShip) +"jg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"},/turf/simulated/shuttle/wall/alien/blue/hard_corner,/area/survivalpod/superpose/CrashedInfestedShip) "jh" = (/obj/structure/prop/poicanister{icon_state = "orangeps-1"},/turf/simulated/floor,/area/survivalpod/superpose/CrashedInfestedShip) "ji" = (/obj/structure/closet/alien,/obj/random/toolbox,/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/toolbox/syndicate/powertools,/obj/item/weapon/storage/toolbox/syndicate,/obj/fiftyspawner/phoronrglass,/obj/fiftyspawner/phoronrglass,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/shuttle/floor/yellow,/area/survivalpod/superpose/CrashedInfestedShip) "jm" = (/obj/structure/table/alien,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/CrashedInfestedShip) @@ -121,7 +121,7 @@ "qP" = (/obj/effect/floor_decal/techfloor,/obj/machinery/light/poi{dir = 1},/turf/simulated/shuttle/floor/alienplating,/area/survivalpod/superpose/CrashedInfestedShip) "qQ" = (/turf/simulated/shuttle/floor/alien,/area/survivalpod/superpose/CrashedInfestedShip) "qS" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/survivalpod/superpose/CrashedInfestedShip) -"qY" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/survivalpod/superpose/CrashedInfestedShip) +"qY" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/survivalpod/superpose/CrashedInfestedShip) "ri" = (/obj/fire,/turf/simulated/floor/airless,/area/survivalpod/superpose/CrashedInfestedShip) "ru" = (/obj/machinery/light/poi,/turf/simulated/floor/carpet/blue,/area/survivalpod/superpose/CrashedInfestedShip) "rx" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor,/area/survivalpod/superpose/CrashedInfestedShip) diff --git a/modular_chomp/maps/submaps/shelters/CrashedQurantineShip-25x17.dmm b/modular_chomp/maps/submaps/shelters/CrashedQurantineShip-25x17.dmm index 057a78eff3..e85fb816d4 100644 --- a/modular_chomp/maps/submaps/shelters/CrashedQurantineShip-25x17.dmm +++ b/modular_chomp/maps/submaps/shelters/CrashedQurantineShip-25x17.dmm @@ -563,7 +563,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, @@ -602,8 +602,7 @@ /area/survivalpod/superpose/CrashedQurantineShip) "bx" = ( /obj/structure/shuttle/engine/heater{ - dir = 4; - icon_state = "heater" + dir = 4 }, /turf/simulated/shuttle/plating, /area/survivalpod/superpose/CrashedQurantineShip) diff --git a/modular_chomp/maps/submaps/shelters/DemonPool-21x21.dmm b/modular_chomp/maps/submaps/shelters/DemonPool-21x21.dmm index cd1dc4a5ff..3c23160aa7 100644 --- a/modular_chomp/maps/submaps/shelters/DemonPool-21x21.dmm +++ b/modular_chomp/maps/submaps/shelters/DemonPool-21x21.dmm @@ -6,7 +6,7 @@ "kL" = (/turf/simulated/floor/cult{icon_state = "cult-narsie"},/area/survivalpod/superpose/DemonPool) "kM" = (/turf/simulated/wall/cult,/area/survivalpod/superpose/DemonPool) "ok" = (/obj/structure/bed/chair/wood/wings{dir = 4},/turf/simulated/floor/cult,/area/survivalpod/superpose/DemonPool) -"ot" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/DemonPool) +"ot" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/DemonPool) "oD" = (/turf/simulated/floor/lava/outdoors,/area/survivalpod/superpose/DemonPool) "oT" = (/mob/living/simple_mob/vore/demonAI{faction = "neutral"},/turf/simulated/floor/gorefloor,/area/survivalpod/superpose/DemonPool) "pi" = (/turf/simulated/gore,/area/survivalpod/superpose/DemonPool) @@ -15,10 +15,10 @@ "rx" = (/obj/fire,/turf/simulated/floor/gorefloor,/area/survivalpod/superpose/DemonPool) "sn" = (/obj/structure/grille/cult,/obj/structure/bonfire/permanent,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/DemonPool) "tU" = (/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/DemonPool) -"wH" = (/obj/structure/grille/cult,/obj/structure/window/phoronreinforced/full,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 8; icon_state = "pwindow"},/turf/simulated/floor/tiled/steel_dirty{color = "grey"},/area/survivalpod/superpose/DemonPool) +"wH" = (/obj/structure/grille/cult,/obj/structure/window/phoronreinforced/full,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 8},/turf/simulated/floor/tiled/steel_dirty{color = "grey"},/area/survivalpod/superpose/DemonPool) "xx" = (/mob/living/simple_mob/vore/demonAI/wendigo{faction = "neutral"},/turf/simulated/floor/cult,/area/survivalpod/superpose/DemonPool) "yi" = (/obj/structure/bed/chair/bay/chair/padded/red/bignest,/turf/simulated/floor/wood/alt/tile,/area/survivalpod/superpose/DemonPool) -"zf" = (/obj/structure/grille/cult,/obj/structure/window/phoronreinforced/full,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 8; icon_state = "pwindow"},/obj/structure/window/reinforced/survival_pod{dir = 4},/turf/simulated/floor/tiled/steel_dirty{color = "grey"},/area/survivalpod/superpose/DemonPool) +"zf" = (/obj/structure/grille/cult,/obj/structure/window/phoronreinforced/full,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/turf/simulated/floor/tiled/steel_dirty{color = "grey"},/area/survivalpod/superpose/DemonPool) "zp" = (/turf/simulated/floor/gorefloor,/area/survivalpod/superpose/DemonPool) "By" = (/obj/fire,/obj/fire,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/DemonPool) "BE" = (/obj/structure/grille/broken/cult,/obj/fire,/turf/template_noop,/area/survivalpod/superpose/DemonPool) @@ -42,7 +42,7 @@ "Rj" = (/obj/structure/table/marble{color = "#B03A2E"},/obj/item/clothing/suit/cultrobes/alt,/obj/item/clothing/head/helmet/space/cult,/obj/item/clothing/shoes/cult,/obj/item/device/soulstone,/turf/simulated/floor/wood/alt/tile,/area/survivalpod/superpose/DemonPool) "Ru" = (/turf/simulated/floor/wood/alt/tile,/area/survivalpod/superpose/DemonPool) "Rz" = (/obj/structure/cult/talisman,/obj/item/weapon/melee/cultblade,/turf/simulated/floor/cult,/area/survivalpod/superpose/DemonPool) -"RL" = (/mob/living/simple_mob/vore/demonAI/engorge{evasion = 1; health = 750; projectilesound = 'sound/weapons/taser2.ogg'; projectiletype = /obj/item/projectile/beam/stun/electric_spider; size_multiplier = 3; faction = "neutral"},/turf/simulated/floor/cult,/area/survivalpod/superpose/DemonPool) +"RL" = (/mob/living/simple_mob/vore/demonAI/engorge{evasion = 1; faction = "neutral"; health = 750; projectilesound = 'sound/weapons/taser2.ogg'; projectiletype = /obj/item/projectile/beam/stun/electric_spider; size_multiplier = 3},/turf/simulated/floor/cult,/area/survivalpod/superpose/DemonPool) "RR" = (/obj/structure/grille/broken/cult,/turf/template_noop,/area/survivalpod/superpose/DemonPool) "RW" = (/obj/structure/grille/cult,/turf/template_noop,/area/survivalpod/superpose/DemonPool) "Sp" = (/obj/effect/gateway,/turf/simulated/floor/gorefloor,/area/survivalpod/superpose/DemonPool) diff --git a/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm b/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm index dd943539f8..c5acc780e9 100644 --- a/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm +++ b/modular_chomp/maps/submaps/shelters/Dinner-25x25.dmm @@ -424,7 +424,6 @@ /obj/structure/table/standard, /obj/machinery/chemical_dispenser/bar_coffee{ dir = 8; - pixel_y = 0; pixel_x = 4 }, /turf/simulated/floor/tiled/white, @@ -475,7 +474,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, @@ -550,8 +549,7 @@ icon_state = "open"; layer = 2; name = "privacy curtain"; - opacity = 0; - dir = 2 + opacity = 0 }, /turf/simulated/floor/tiled/hydro, /area/survivalpod/superpose/Dinner) diff --git a/modular_chomp/maps/submaps/shelters/ExplorerHome-17x20.dmm b/modular_chomp/maps/submaps/shelters/ExplorerHome-17x20.dmm index dff53ea5ec..2a132834ff 100644 --- a/modular_chomp/maps/submaps/shelters/ExplorerHome-17x20.dmm +++ b/modular_chomp/maps/submaps/shelters/ExplorerHome-17x20.dmm @@ -207,14 +207,12 @@ "aB" = ( /obj/structure/sink{ dir = 8; - icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/structure/mirror{ dir = 4; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/freezer, /area/survivalpod/superpose/ExplorerHome) @@ -243,8 +241,7 @@ /area/survivalpod/superpose/ExplorerHome) "aI" = ( /obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" + dir = 8 }, /obj/machinery/shower{ dir = 1 @@ -546,8 +543,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/carbine, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun, /obj/item/weapon/cell/device/weapon{ pixel_x = -2; pixel_y = -2 diff --git a/modular_chomp/maps/submaps/shelters/Farm-32x32.dmm b/modular_chomp/maps/submaps/shelters/Farm-32x32.dmm index e7a2b0a0e6..7b31172058 100644 --- a/modular_chomp/maps/submaps/shelters/Farm-32x32.dmm +++ b/modular_chomp/maps/submaps/shelters/Farm-32x32.dmm @@ -67,8 +67,7 @@ /area/template_noop) "fp" = ( /obj/structure/bed/chair/wood{ - dir = 8; - icon_state = "wooden_chair" + dir = 8 }, /turf/simulated/floor/wood, /area/survivalpod/superpose/Farm) @@ -324,7 +323,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, diff --git a/modular_chomp/maps/submaps/shelters/FieldLab-20x20.dmm b/modular_chomp/maps/submaps/shelters/FieldLab-20x20.dmm index 6f902de7b5..e8bbc200d7 100644 --- a/modular_chomp/maps/submaps/shelters/FieldLab-20x20.dmm +++ b/modular_chomp/maps/submaps/shelters/FieldLab-20x20.dmm @@ -33,9 +33,7 @@ "hx" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/simulated/floor/tiled/steel_dirty, /area/survivalpod/superpose/FieldLab) @@ -45,8 +43,7 @@ /area/survivalpod/superpose/FieldLab) "ja" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/survivalpod/superpose/FieldLab) @@ -174,8 +171,7 @@ "zX" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/survivalpod/superpose/FieldLab) @@ -209,7 +205,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, @@ -364,8 +360,7 @@ "MD" = ( /obj/machinery/vending/tool, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/steel_dirty, /area/survivalpod/superpose/FieldLab) @@ -388,8 +383,7 @@ /area/survivalpod/superpose/FieldLab) "Oe" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/steel_dirty, /area/survivalpod/superpose/FieldLab) @@ -402,8 +396,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/shoes/boots/winter, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/steel_dirty, /area/survivalpod/superpose/FieldLab) diff --git a/modular_chomp/maps/submaps/shelters/HellCave-40x25.dmm b/modular_chomp/maps/submaps/shelters/HellCave-40x25.dmm index bd62112ced..32f36ae169 100644 --- a/modular_chomp/maps/submaps/shelters/HellCave-40x25.dmm +++ b/modular_chomp/maps/submaps/shelters/HellCave-40x25.dmm @@ -6,7 +6,7 @@ "gW" = (/obj/effect/map_effect/interval/sound_emitter/punching,/obj/effect/map_effect/interval/effect_emitter/smoke/fire,/turf/simulated/floor/lava,/area/survivalpod/superpose/HellCave) "iK" = (/turf/simulated/floor/gorefloor,/area/survivalpod/superpose/HellCave) "jG" = (/obj/structure/closet/crate,/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/fiftyspawner/blucarpet,/obj/fiftyspawner/oracarpet,/obj/fiftyspawner/purcarpet,/obj/fiftyspawner/sblucarpet,/obj/fiftyspawner/tealcarpet,/obj/fiftyspawner/turcarpet,/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/algae{amount = 50},/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/lead{amount = 30},/obj/item/stack/material/plasteel{amount = 30; pixel_y = 5},/obj/item/stack/material/resin{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/HellCave) -"kE" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/HellCave) +"kE" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/HellCave) "lF" = (/turf/simulated/mineral/ignore_mapgen,/area/survivalpod/superpose/HellCave) "lQ" = (/obj/item/weapon/bone/skull/unknown,/turf/simulated/floor/lava,/area/survivalpod/superpose/HellCave) "nD" = (/obj/effect/gibspawner/human,/turf/simulated/floor/gorefloor2,/area/survivalpod/superpose/HellCave) diff --git a/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm b/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm index 9abc0cd92b..5f39bfbeb6 100644 --- a/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm +++ b/modular_chomp/maps/submaps/shelters/HydroCave-40x40.dmm @@ -64,7 +64,7 @@ "nk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Security Checkpoint Maintenance"; req_access_txt = "201"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/survivalpod/superpose/HydroCave) "nV" = (/obj/machinery/vending/deluxe_dinner{req_access = null; req_log_access = null},/turf/simulated/floor/tiled/dark,/area/survivalpod/superpose/HydroCave) "og" = (/obj/structure/closet/crate,/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/fiftyspawner/blucarpet,/obj/fiftyspawner/oracarpet,/obj/fiftyspawner/purcarpet,/obj/fiftyspawner/sblucarpet,/obj/fiftyspawner/tealcarpet,/obj/fiftyspawner/turcarpet,/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/algae{amount = 50},/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/lead{amount = 30},/obj/item/stack/material/plasteel{amount = 30; pixel_y = 5},/obj/item/stack/material/resin{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1; initialize_directions = 14; tag = "icon-manifold-b-f (NORTH)"},/turf/simulated/floor/plating,/area/survivalpod/superpose/HydroCave) -"oq" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/plating,/area/survivalpod/superpose/HydroCave) +"oq" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/plating,/area/survivalpod/superpose/HydroCave) "oQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock{id_tag = "awaydorm2"; name = "Dorm 2"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/survivalpod/superpose/HydroCave) "oX" = (/obj/effect/decal/cleanable/blood/oil{color = "black"},/turf/simulated/floor/plating,/area/survivalpod/superpose/HydroCave) "oZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/wall/r_wall,/area/survivalpod/superpose/HydroCave) diff --git a/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm b/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm index 242deaeb4d..1c0bb8e7d7 100644 --- a/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm +++ b/modular_chomp/maps/submaps/shelters/LargeAlienShip-57x25.dmm @@ -49,7 +49,7 @@ "iM" = (/obj/effect/floor_decal/techfloor/corner{dir = 9},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/LargeAlienShip) "iQ" = (/obj/structure/particle_accelerator/particle_emitter/center{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/LargeAlienShip) "jd" = (/obj/machinery/atmospherics/pipe/tank/phoron/full,/turf/simulated/floor,/area/survivalpod/superpose/LargeAlienShip) -"jg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/wall/alien/blue/hard_corner,/area/survivalpod/superpose/LargeAlienShip) +"jg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"},/turf/simulated/shuttle/wall/alien/blue/hard_corner,/area/survivalpod/superpose/LargeAlienShip) "jh" = (/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/machinery/door/window/brigdoor/eastright{name = "Laser Armor"},/obj/structure/table/rack/shelf/steel,/obj/item/weapon/gun/energy/hooklauncher,/turf/simulated/shuttle/floor/darkred,/area/survivalpod/superpose/LargeAlienShip) "ji" = (/obj/structure/closet/alien,/obj/random/toolbox,/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/toolbox/syndicate/powertools,/obj/item/weapon/storage/toolbox/syndicate,/obj/fiftyspawner/phoronrglass,/obj/fiftyspawner/phoronrglass,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/shuttle/floor/yellow,/area/survivalpod/superpose/LargeAlienShip) "jm" = (/obj/structure/table/alien,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/LargeAlienShip) @@ -68,7 +68,7 @@ "mm" = (/obj/machinery/power/emitter/gyrotron,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/cyan,/turf/simulated/floor,/area/survivalpod/superpose/LargeAlienShip) "mv" = (/obj/structure/window/reinforced/survival_pod,/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/machinery/door/window/brigdoor/westleft{name = "Combat Armor"},/obj/structure/table/rack/shelf/steel,/obj/item/weapon/rig/hazard/equipped,/turf/simulated/shuttle/floor/darkred,/area/survivalpod/superpose/LargeAlienShip) "my" = (/obj/machinery/oxygen_pump/anesthetic,/turf/simulated/shuttle/wall/alien/blue/hard_corner,/area/survivalpod/superpose/LargeAlienShip) -"mG" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/west,/turf/simulated/shuttle/floor/alienplating,/area/survivalpod/superpose/LargeAlienShip) +"mG" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/west,/turf/simulated/shuttle/floor/alienplating,/area/survivalpod/superpose/LargeAlienShip) "mK" = (/obj/machinery/power/emitter/gyrotron,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/cyan,/turf/simulated/floor,/area/survivalpod/superpose/LargeAlienShip) "mQ" = (/obj/structure/closet/alien,/obj/item/clothing/suit/space/void/autolok,/obj/item/clothing/suit/space/void/autolok,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/shuttle/floor/yellow,/area/survivalpod/superpose/LargeAlienShip) "mT" = (/obj/machinery/cryopod,/obj/structure/cryofeed{dir = 4; pixel_x = 32},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/LargeAlienShip) @@ -152,7 +152,7 @@ "DF" = (/obj/structure/prop/alien/pod/hybrid,/obj/structure/window/reinforced/survival_pod{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/LargeAlienShip) "DJ" = (/obj/structure/grille/cult{name = "Alien grille"},/obj/structure/window/phoronreinforced/full,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{dir = 1},/obj/structure/window/phoronreinforced{dir = 4},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/LargeAlienShip) "DK" = (/obj/structure/table/alien/blue,/obj/structure/window/reinforced/survival_pod,/obj/item/weapon/tape_roll,/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/LargeAlienShip) -"DX" = (/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/smartfridge/survival_pod{desc = "A mysterious machine which can fabricate many tools for acquiring test subjects."; icon = 'icons/obj/abductor_vr.dmi'; icon_base = "dispenser_2way"; icon_state = "dispenser_2way"; name = "Implant-Co"},/turf/simulated/floor/plating,/area/survivalpod/superpose/LargeAlienShip) +"DX" = (/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/smartfridge/survival_pod{desc = "A mysterious machine which can fabricate many tools for acquiring test subjects."; icon = 'icons/obj/abductor_vr.dmi'; icon_base = "dispenser_2way"; icon_state = "dispenser_2way"; name = "Implant-Co"},/turf/simulated/floor/plating,/area/survivalpod/superpose/LargeAlienShip) "Ee" = (/obj/structure/table/bench/glass,/turf/simulated/floor/carpet/gaycarpet,/area/survivalpod/superpose/LargeAlienShip) "El" = (/obj/structure/toilet{dir = 1},/obj/structure/curtain/open/shower/security,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/LargeAlienShip) "Ep" = (/obj/structure/particle_accelerator/particle_emitter/left{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/LargeAlienShip) @@ -221,7 +221,7 @@ "US" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/survivalpod/superpose/LargeAlienShip) "Vk" = (/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/LargeAlienShip) "Vq" = (/obj/effect/floor_decal/techfloor,/turf/simulated/floor/wood/sif,/area/survivalpod/superpose/LargeAlienShip) -"Vt" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/west,/turf/simulated/floor/plating,/area/survivalpod/superpose/LargeAlienShip) +"Vt" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/west,/turf/simulated/floor/plating,/area/survivalpod/superpose/LargeAlienShip) "Vu" = (/obj/machinery/power/rad_collector,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/cyan,/turf/simulated/floor,/area/survivalpod/superpose/LargeAlienShip) "Vw" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/LargeAlienShip) "VF" = (/obj/machinery/atmospherics/pipe/tank/phoron/full{dir = 8},/turf/simulated/floor,/area/survivalpod/superpose/LargeAlienShip) diff --git a/modular_chomp/maps/submaps/shelters/LoneHome-18x22.dmm b/modular_chomp/maps/submaps/shelters/LoneHome-18x22.dmm index 0c89f4b404..5a63f42568 100644 --- a/modular_chomp/maps/submaps/shelters/LoneHome-18x22.dmm +++ b/modular_chomp/maps/submaps/shelters/LoneHome-18x22.dmm @@ -999,7 +999,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, diff --git a/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm b/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm index 9554a36f3b..7ac2228d0f 100644 --- a/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm +++ b/modular_chomp/maps/submaps/shelters/MechFabShip-27x24.dmm @@ -114,7 +114,7 @@ "KR" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4},/obj/effect/map_helper/airlock/atmos/chamber_pump,/turf/simulated/floor/plating,/area/survivalpod/superpose/MechFabShip) "Lg" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/phoron,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/techfloor/corner{dir = 9},/turf/simulated/floor/plating,/area/survivalpod/superpose/MechFabShip) "LN" = (/obj/structure/window/reinforced/survival_pod,/turf/simulated/shuttle/floor/darkred,/area/survivalpod/superpose/MechFabShip) -"Ms" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/light/poi{dir = 1},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/MechFabShip) +"Ms" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/light/poi{dir = 1},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/MechFabShip) "Mv" = (/obj/machinery/door/blast/regular{dir = 4; id = "kalipsoshutters"; name = "Kalipso Blast Shielding"},/turf/simulated/floor/tiled/techfloor/grid,/area/survivalpod/superpose/MechFabShip) "MZ" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/techfloor/orange/corner{dir = 8},/obj/effect/floor_decal/techfloor/corner{dir = 9},/turf/simulated/floor/plating,/area/survivalpod/superpose/MechFabShip) "Nr" = (/obj/structure/window/reinforced/survival_pod{opacity = 1},/obj/machinery/r_n_d/server/core,/obj/structure/window/reinforced/survival_pod{dir = 4; opacity = 1},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/MechFabShip) diff --git a/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm b/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm index 3fe26681c5..2c210f041f 100644 --- a/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm +++ b/modular_chomp/maps/submaps/shelters/MechStorageFab-32x24.dmm @@ -100,7 +100,7 @@ "JE" = (/obj/machinery/atmospherics/binary/passive_gate{dir = 8; regulate_mode = 0; unlocked = 1},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/MechStorageFab) "JR" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/mecha/combat/phazon/old,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) "JT" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/loot_pile/mecha/durand,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MechStorageFab) -"JV" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) +"JV" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "Ke" = (/obj/machinery/robotic_fabricator,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "Kt" = (/obj/machinery/alarm/alarms_hidden{dir = 8; pixel_x = 22},/obj/machinery/holoplant,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) "KE" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9},/obj/random/maintenance,/turf/simulated/floor/tiled/asteroid_steel,/area/survivalpod/superpose/MechStorageFab) diff --git a/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm b/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm index f4d6ae3bc6..45f2937e0b 100644 --- a/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm +++ b/modular_chomp/maps/submaps/shelters/MercShip-57x25.dmm @@ -63,7 +63,7 @@ "iM" = (/obj/effect/floor_decal/techfloor/corner{dir = 9},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MercShip) "jc" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/light/poi{dir = 4},/obj/structure/salvageable/console_os{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/MercShip) "jd" = (/obj/machinery/atmospherics/pipe/tank/phoron/full,/turf/simulated/floor,/area/survivalpod/superpose/MercShip) -"jg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/skipjack,/area/survivalpod/superpose/MercShip) +"jg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"},/turf/simulated/wall/skipjack,/area/survivalpod/superpose/MercShip) "jh" = (/obj/structure/table/rack/shelf/steel,/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MercShip) "ji" = (/obj/structure/closet/alien,/obj/random/toolbox,/obj/random/toolbox,/obj/random/toolbox,/obj/item/weapon/storage/toolbox/syndicate/powertools,/obj/item/weapon/storage/toolbox/syndicate,/obj/fiftyspawner/phoronrglass,/obj/fiftyspawner/phoronrglass,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/shuttle/floor/yellow,/area/survivalpod/superpose/MercShip) "jm" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/salvageable/bliss,/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/MercShip) @@ -84,7 +84,7 @@ "mK" = (/obj/machinery/power/emitter/gyrotron,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/cyan,/turf/simulated/floor,/area/survivalpod/superpose/MercShip) "mQ" = (/obj/structure/closet/alien,/obj/item/clothing/suit/space/void/autolok,/obj/item/clothing/suit/space/void/autolok,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/tank/emergency/oxygen/double,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/shuttle/floor/yellow,/area/survivalpod/superpose/MercShip) "mT" = (/obj/machinery/cryopod,/obj/structure/cryofeed{dir = 4; pixel_x = 32},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/MercShip) -"nj" = (/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/smartfridge/survival_pod{icon = 'icons/obj/vending.dmi'; icon_base = "fridge_sci"; icon_contents = "chem"; icon_state = "fridge_sci"; name = "Advanced storage"; pixel_y = 0},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MercShip) +"nj" = (/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/smartfridge/survival_pod{icon = 'icons/obj/vending.dmi'; icon_base = "fridge_sci"; icon_contents = "chem"; icon_state = "fridge_sci"; name = "Advanced storage"; pixel_y = 0},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/MercShip) "ns" = (/obj/machinery/light/poi{dir = 1},/turf/simulated/floor/airless,/area/survivalpod/superpose/MercShip) "nt" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor,/area/survivalpod/superpose/MercShip) "nv" = (/obj/item/weapon/soap/deluxe,/obj/item/weapon/soap/deluxe,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/structure/table/hardwoodtable,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/MercShip) @@ -155,7 +155,7 @@ "zI" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/black,/area/survivalpod/superpose/MercShip) "Af" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/rddouble,/obj/machinery/light/poi{dir = 4},/turf/simulated/floor/carpet,/area/survivalpod/superpose/MercShip) "Aj" = (/obj/structure/table/bench/glass,/turf/simulated/floor/carpet/blue,/area/survivalpod/superpose/MercShip) -"AB" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_lead,/area/survivalpod/superpose/MercShip) +"AB" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"},/turf/simulated/wall/r_lead,/area/survivalpod/superpose/MercShip) "AL" = (/obj/machinery/door/window/brigdoor/northright{dir = 2; req_access = null},/obj/structure/table/hardwoodtable,/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/MercShip) "AP" = (/obj/machinery/vending/medical{dir = 4; emagged = 1; pixel_x = 5; req_access = list(777)},/turf/simulated/shuttle/floor/white,/area/survivalpod/superpose/MercShip) "AS" = (/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/shuttle/floor/black,/area/survivalpod/superpose/MercShip) diff --git a/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm b/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm index b4ed434aa5..002ad6c649 100644 --- a/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm +++ b/modular_chomp/maps/submaps/shelters/MethLab-20x20.dmm @@ -291,7 +291,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, diff --git a/modular_chomp/maps/submaps/shelters/OldHotel-25x25.dmm b/modular_chomp/maps/submaps/shelters/OldHotel-25x25.dmm index bfa280838e..87a1eb2fde 100644 --- a/modular_chomp/maps/submaps/shelters/OldHotel-25x25.dmm +++ b/modular_chomp/maps/submaps/shelters/OldHotel-25x25.dmm @@ -603,7 +603,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, diff --git a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm index 59ee5cb20f..04c3ba32a9 100644 --- a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm +++ b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm @@ -15,9 +15,9 @@ "cK" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/orangedouble,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) "cL" = (/obj/machinery/button/remote/airlock{id = "awaydorm_restaurationbar1"; name = "Bolt Control"; pixel_y = -29; specialfunctions = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "cT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/turf/space,/area/survivalpod/superpose/RestaurationBar) -"da" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"da" = (/obj/machinery/light{dir = 4},/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "ds" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) -"dN" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/closet/crate/bin,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"dN" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 8},/obj/structure/closet/crate/bin,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "dP" = (/obj/machinery/honey_extractor,/obj/effect/floor_decal/corner/lime/border{dir = 1},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) "ec" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/obj/item/weapon/material/ashtray/glass,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/fancy/cigarettes/professionals,/obj/item/weapon/storage/fancy/cigar/havana,/obj/structure/table/hardwoodtable,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "ei" = (/obj/structure/table/gamblingtable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) @@ -43,7 +43,7 @@ "hk" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "hr" = (/obj/structure/table/bench/glass,/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/machinery/light{layer = 3},/obj/structure/flora/pottedplant/thinbush{pixel_y = 10},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "hu" = (/obj/machinery/appliance/cooker/fryer,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) -"hw" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/royal,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external,/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"hw" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/royal,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external,/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "hE" = (/obj/random/pottedplant,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "hI" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "ii" = (/obj/structure/simple_door/wood,/obj/structure/simple_door/wood,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) @@ -65,7 +65,7 @@ "lT" = (/obj/structure/table/gamblingtable,/obj/item/weapon/pen,/obj/item/weapon/paper_bin,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "lZ" = (/obj/machinery/autolathe{hacked = 1},/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "mp" = (/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) -"mx" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"mx" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "mz" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -34},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "mU" = (/obj/machinery/door/airlock{id_tag = "awaydorm_restaurationbar1"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "mZ" = (/obj/structure/casino_table/roulette_table,/obj/structure/casino_table/roulette_chart,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) @@ -79,7 +79,7 @@ "oQ" = (/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "po" = (/obj/structure/casino_table/blackjack_m,/obj/item/weapon/deck/cards,/obj/machinery/light/floortube,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "pv" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) -"pB" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"pB" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/machinery/light{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "pF" = (/obj/structure/flora/ausbushes/ppflowers,/mob/living/simple_mob/vore/alienanimals/teppi/baby,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) "pW" = (/obj/machinery/computer/arcade{dir = 4},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "qp" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) @@ -94,7 +94,7 @@ "rd" = (/obj/structure/table/reinforced,/obj/item/weapon/deskbell,/turf/simulated/floor/wood/broken,/area/survivalpod/superpose/RestaurationBar) "rg" = (/obj/structure/table/rack/shelf,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/makeover,/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "rh" = (/obj/machinery/replicator/clothing,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) -"rO" = (/obj/machinery/vending/dinnerware{req_log_access = null},/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"rO" = (/obj/machinery/vending/dinnerware{req_log_access = null},/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "rS" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 26},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "si" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "sj" = (/obj/structure/flora/ausbushes/leafybush,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) @@ -116,7 +116,7 @@ "uo" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "uu" = (/obj/structure/bed/chair/oldsofa/left{dir = 1},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "uw" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) -"uJ" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/black,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external,/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"uJ" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/rifle,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/black,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external,/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "uM" = (/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "uO" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "uX" = (/obj/machinery/appliance/mixer/cereal,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) @@ -129,7 +129,7 @@ "vM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "wg" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "wm" = (/obj/structure/closet/toolcloset,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/module/id_auth,/obj/item/weapon/module/card_reader,/obj/item/weapon/module/cell_power,/obj/item/weapon/module/power_control,/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/mass_driver,/obj/item/weapon/circuitboard/jukebox,/obj/item/weapon/circuitboard/intercom,/obj/item/weapon/circuitboard/firealarm,/obj/item/weapon/circuitboard/airalarm,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/belt/utility/full/multitool,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/device/geiger,/obj/item/device/mapping_unit,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/shoes/dress,/obj/item/clothing/shoes/dress,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) -"wp" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/recharger/wallcharger{pixel_x = 36; pixel_y = 3},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"wp" = (/obj/machinery/light{dir = 4},/obj/machinery/recharger/wallcharger{pixel_x = 36; pixel_y = 3},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "xj" = (/obj/machinery/button/remote/airlock{id = "awaydorm_restaurationbar"; name = "Bolt Control"; pixel_y = 30; specialfunctions = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "xn" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "xo" = (/obj/machinery/seed_storage/garden,/obj/effect/floor_decal/corner/lime/border{dir = 9},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) @@ -144,7 +144,7 @@ "yL" = (/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "yS" = (/obj/effect/floor_decal/corner/lime/border{dir = 8},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) "yT" = (/obj/structure/table/fancyblack,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/random/drinkbottle,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) -"zA" = (/obj/machinery/vending/boozeomat{req_log_access = null; req_access = null},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"zA" = (/obj/machinery/vending/boozeomat{req_access = null; req_log_access = null},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "zG" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "zN" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "Ae" = (/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) @@ -160,12 +160,12 @@ "Br" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "BC" = (/obj/structure/closet/crate,/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/fiftyspawner/blucarpet,/obj/fiftyspawner/oracarpet,/obj/fiftyspawner/purcarpet,/obj/fiftyspawner/sblucarpet,/obj/fiftyspawner/tealcarpet,/obj/fiftyspawner/turcarpet,/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/algae{amount = 50},/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/lead{amount = 30},/obj/item/stack/material/plasteel{amount = 30; pixel_y = 5},/obj/item/stack/material/resin{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "BK" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_y = 28},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) -"BX" = (/obj/structure/extinguisher_cabinet{dir = 1; pixel_y = -30},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"BX" = (/obj/structure/extinguisher_cabinet{dir = 1; pixel_y = -30},/obj/machinery/light{dir = 4},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) "Ci" = (/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) "Cj" = (/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) "CW" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "Dc" = (/obj/structure/table/fancyblack,/obj/item/weapon/newspaper,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) -"Di" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/secure_closet/freezer/kitchen{req_access = null},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Di" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 4},/obj/structure/closet/secure_closet/freezer/kitchen{req_access = null},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "Do" = (/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "DF" = (/obj/structure/table/marble,/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "DU" = (/obj/structure/bed/chair/oldsofa{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) @@ -179,11 +179,11 @@ "Ff" = (/obj/structure/table/standard,/obj/random/donkpocketbox,/obj/item/device/starcaster_news,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) "Fi" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "Fk" = (/obj/machinery/appliance/mixer/candy,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) -"Fl" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Fl" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "FE" = (/obj/machinery/vending/cola{dir = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "FI" = (/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) "FO" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/obj/item/weapon/pen,/obj/item/device/taperecorder,/obj/item/weapon/paper_bin,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) -"FV" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"FV" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "FW" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "Gj" = (/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) "Gx" = (/obj/effect/floor_decal/corner/lime/border{dir = 1},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) @@ -199,10 +199,10 @@ "HL" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/effect/floor_decal/spline/fancy/wood/corner,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "HQ" = (/obj/effect/floor_decal/spline/fancy{dir = 1},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "HV" = (/obj/effect/floor_decal/corner/lime/bordercorner,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) -"Ix" = (/obj/structure/bed/chair/oldsofa{dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/toy/plushie/blue_fox,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Ix" = (/obj/structure/bed/chair/oldsofa{dir = 8},/obj/machinery/light{dir = 4},/obj/item/toy/plushie/blue_fox,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "IB" = (/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) "II" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) -"IO" = (/obj/effect/floor_decal/spline/fancy{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"IO" = (/obj/effect/floor_decal/spline/fancy{dir = 6},/obj/machinery/light{dir = 4},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "IR" = (/obj/effect/map_effect/perma_light,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "Jb" = (/obj/structure/bed/chair/oldsofa/corner{dir = 8},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "Jf" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) @@ -219,7 +219,7 @@ "Km" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 1},/obj/item/weapon/reagent_containers/chem_disp_cartridge/nothing,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "Ko" = (/obj/structure/table/marble,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/multi,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "Kw" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) -"KP" = (/obj/effect/floor_decal/spline/fancy/wood/cee{dir = 8},/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/flora/pottedplant/tall,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"KP" = (/obj/effect/floor_decal/spline/fancy/wood/cee{dir = 8},/obj/machinery/light{dir = 8},/obj/structure/flora/pottedplant/tall,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "KR" = (/mob/living/simple_mob/vore/alienanimals/teppi/baby,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) "KS" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) "La" = (/obj/machinery/door/airlock{id_tag = "awaydorm_restaurationbar"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) @@ -253,7 +253,7 @@ "Ov" = (/obj/machinery/door/airlock{name = "Unit 3"},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "OA" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/donut,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "OI" = (/obj/structure/sink/puddle,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) -"OP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/weapon/melee/umbrella/random,/obj/item/weapon/melee/umbrella/random,/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"OP" = (/obj/machinery/light{dir = 4},/obj/item/weapon/melee/umbrella/random,/obj/item/weapon/melee/umbrella/random,/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) "OR" = (/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "Ps" = (/obj/structure/bed/chair/oldsofa/right{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "PE" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) @@ -264,7 +264,7 @@ "Qh" = (/obj/structure/table/fancyblack,/obj/random/drinksoft,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "Qm" = (/obj/effect/floor_decal/spline/fancy{dir = 4; icon_state = "spline_fancy_corner"},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "QD" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) -"QK" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/button/holosign{id = "baropen_restaurationbar_ch"; name = "Open Sign"; pixel_x = 36; pixel_y = 6},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"QK" = (/obj/machinery/light{dir = 4},/obj/machinery/button/holosign{id = "baropen_restaurationbar_ch"; name = "Open Sign"; pixel_x = 36; pixel_y = 6},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "QQ" = (/obj/structure/bed/chair/oldsofa/right,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "QS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "QX" = (/obj/structure/bed/chair/oldsofa/left{dir = 4},/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) @@ -282,13 +282,13 @@ "Tu" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) "TE" = (/obj/effect/floor_decal/spline/fancy{dir = 5},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "TT" = (/obj/machinery/atm{pixel_y = -30},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) -"TW" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"TW" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "Uq" = (/obj/effect/floor_decal/corner/lime/bordercorner{dir = 8},/obj/effect/floor_decal/corner/lime/bordercorner{dir = 1},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) "UH" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/trash/plate,/obj/item/weapon/reagent_containers/food/snacks/hotdog,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "UV" = (/obj/structure/casino_table/roulette_table,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "Vf" = (/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) "Vg" = (/obj/machinery/recharge_station,/obj/machinery/light/small,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) -"Vh" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"Vh" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) "Vy" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_y = 32},/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "VD" = (/obj/structure/table/standard,/obj/item/device/starcaster_news,/obj/item/weapon/reagent_containers/food/snacks/meatsteak,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "VF" = (/obj/machinery/door/window/westleft{name = "Bar"},/obj/machinery/power/apc/alarms_hidden,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) @@ -303,12 +303,12 @@ "WV" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "WZ" = (/obj/effect/floor_decal/spline/fancy,/obj/structure/prop/statue/pillar/dark,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "Xp" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/glasses/meta,/obj/item/weapon/storage/box/glasses/meta,/obj/item/weapon/storage/box/glasses/coffeemug{pixel_x = -6; pixel_y = 12},/obj/item/weapon/storage/box/glasses/coffeecup{pixel_x = -6; pixel_y = 1},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) -"Xs" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/item/weapon/melee/umbrella/random,/obj/item/weapon/melee/umbrella/random,/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) -"Xt" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/flora/pottedplant/tropical,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Xs" = (/obj/machinery/light{dir = 8},/obj/item/weapon/melee/umbrella/random,/obj/item/weapon/melee/umbrella/random,/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"Xt" = (/obj/machinery/light{dir = 8},/obj/structure/flora/pottedplant/tropical,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "XA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "XI" = (/obj/structure/window/reinforced{health = 1e+006},/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) "XS" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) -"Yc" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_alc/full{dispense_reagents = list("iron","radium","lemon_lime","sugar","orangejuice","limejuice","sodawater","tonic","beer","kahlua","whiskey","redwine","whitewine","vodka","cider","gin","rum","tequilla","vermouth","cognac","ale","mead","bitters"); dir = 1},/obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Yc" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_alc/full{dir = 1; dispense_reagents = list("iron","radium","lemon_lime","sugar","orangejuice","limejuice","sodawater","tonic","beer","kahlua","whiskey","redwine","whitewine","vodka","cider","gin","rum","tequilla","vermouth","cognac","ale","mead","bitters")},/obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "Yf" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/device/communicator,/obj/item/trash/plate,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "Yg" = (/obj/structure/table/marble,/obj/item/weapon/book/manual/chef_recipes,/obj/item/weapon/material/knife/butch,/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "Ym" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/closet/secure_closet/hydroponics{req_access = null},/obj/effect/floor_decal/corner/lime/border{dir = 6},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) diff --git a/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm b/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm index c6622c0346..4d7c4f0047 100644 --- a/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SmallCombatShip-9x11.dmm @@ -9,7 +9,7 @@ "s" = (/obj/structure/closet/walllocker_double/medical/west,/obj/item/weapon/storage/firstaid,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/obj/item/roller,/obj/effect/floor_decal/techfloor{dir = 4},/obj/structure/window/reinforced/survival_pod,/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/SmallCombatShip) "t" = (/obj/effect/catwalk_plated/dark,/obj/effect/catwalk_plated/dark,/turf/template_noop,/area/survivalpod/superpose/SmallCombatShip) "u" = (/obj/machinery/porta_turret/stationary/syndie{faction = "neutral"},/turf/simulated/floor/plating/external,/area/survivalpod/superpose/SmallCombatShip) -"w" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/east,/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/SmallCombatShip) +"w" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/east,/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/SmallCombatShip) "z" = (/obj/structure/salvageable/server,/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/SmallCombatShip) "A" = (/obj/structure/shuttle/engine/heater,/turf/simulated/wall/shull,/area/survivalpod/superpose/SmallCombatShip) "C" = (/obj/structure/closet/walllocker_double/kitchen/east{name = "Ration Cabinet"},/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/device/radio{pixel_x = -5; pixel_y = 5},/obj/item/device/radio{pixel_x = -5; pixel_y = 5},/obj/item/device/radio{pixel_x = 5; pixel_y = 5},/obj/item/device/radio{pixel_x = 5; pixel_y = 5},/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/window/reinforced/survival_pod,/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/SmallCombatShip) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalBarracks-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalBarracks-11x11.dmm index a18457a569..b586ef3fba 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalBarracks-11x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalBarracks-11x11.dmm @@ -2,7 +2,7 @@ "b" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/SurvivalBarracks) "c" = (/obj/machinery/light{dir = 4},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalBarracks) "d" = (/obj/structure/bed/double,/obj/item/weapon/bedsheet/hopdouble,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalBarracks) -"e" = (/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/SurvivalBarracks) +"e" = (/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/SurvivalBarracks) "f" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalBarracks) "g" = (/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalBarracks) "h" = (/obj/structure/fans{pixel_y = 32},/obj/machinery/vending/loadout/clothing,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) @@ -19,10 +19,10 @@ "s" = (/obj/machinery/door/airlock/maintenance/common{name = "Dorm"},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalBarracks) "t" = (/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalBarracks) "u" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp{pixel_x = -8; pixel_y = 13},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = 5; pixel_y = 6},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalBarracks) -"v" = (/obj/structure/closet/walllocker_double/south{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/carpet/gaycarpet,/area/survivalpod/superpose/SurvivalBarracks) +"v" = (/obj/structure/closet/walllocker_double/south{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/carpet/gaycarpet,/area/survivalpod/superpose/SurvivalBarracks) "w" = (/obj/machinery/vending/fitness{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) "x" = (/obj/item/device/gps/computer{pixel_y = 0},/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) -"y" = (/obj/structure/closet/walllocker_double/south{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/carpet/blue,/area/survivalpod/superpose/SurvivalBarracks) +"y" = (/obj/structure/closet/walllocker_double/south{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/carpet/blue,/area/survivalpod/superpose/SurvivalBarracks) "z" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille,/obj/structure/curtain/black,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalBarracks) "A" = (/obj/structure/bed/chair/comfy/blue{dir = 8},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalBarracks) "B" = (/obj/machinery/vending/snack{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) @@ -41,7 +41,7 @@ "O" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/item/weapon/pen,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalBarracks) "P" = (/obj/machinery/vending/coffee{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) "Q" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/blue,/area/survivalpod/superpose/SurvivalBarracks) -"R" = (/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/SurvivalBarracks) +"R" = (/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/SurvivalBarracks) "S" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalBarracks) "T" = (/obj/machinery/vending/cigarette{dir = 1},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) "U" = (/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalBarracks) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalCargo-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalCargo-11x11.dmm index 0bfe73f8ad..5acc69f81a 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalCargo-11x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalCargo-11x11.dmm @@ -2,15 +2,12 @@ "ag" = ( /obj/structure/table/survival_pod, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /obj/machinery/recharger{ - pixel_y = 0; pixel_x = -5 }, /obj/machinery/recharger{ - pixel_y = 0; pixel_x = 6 }, /turf/simulated/shuttle/floor/voidcraft/light, @@ -54,8 +51,7 @@ opacity = 1 }, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /obj/item/device/gps/mining{ pixel_x = -5 @@ -111,8 +107,7 @@ opacity = 1 }, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod/superpose/SurvivalCargo) @@ -129,8 +124,7 @@ "oQ" = ( /obj/machinery/sleeper/survival_pod, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod/superpose/SurvivalCargo) @@ -157,12 +151,10 @@ /obj/structure/table/rack/shelf/steel, /obj/item/device/suit_cooling_unit, /obj/structure/window/reinforced/survival_pod{ - dir = 1; - icon_state = "pwindow" + dir = 1 }, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod/superpose/SurvivalCargo) @@ -241,7 +233,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, @@ -305,10 +297,10 @@ /area/survivalpod/superpose/SurvivalCargo) "Cu" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/locked/frontier/carbine{ - pixel_y = 7 +/obj/item/weapon/gun/energy/locked/phasegun/rifle{ + pixel_y = 3 }, -/obj/item/weapon/gun/energy/locked/frontier/carbine{ +/obj/item/weapon/gun/energy/locked/phasegun/rifle{ pixel_y = -4 }, /obj/machinery/light{ @@ -362,12 +354,10 @@ }, /obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced/survival_pod{ - dir = 1; - icon_state = "pwindow" + dir = 1 }, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /obj/item/device/gps/mining{ pixel_x = -5 @@ -384,16 +374,14 @@ }, /obj/item/weapon/storage/toolbox/mechanical, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod/superpose/SurvivalCargo) "JT" = ( /obj/structure/fans, /obj/structure/window/reinforced/survival_pod{ - dir = 8; - icon_state = "pwindow" + dir = 8 }, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod/superpose/SurvivalCargo) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm index 91ef8c9fee..c3b089f7b8 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalDIY-11x11.dmm @@ -178,9 +178,7 @@ /turf/simulated/floor/plating, /area/survivalpod/superpose/SurvivalDIY_11x11) "t" = ( -/obj/vehicle/train/engine/quadbike/built{ - dir = 4 - }, +/obj/vehicle/train/engine/quadbike/built, /turf/simulated/floor/plating, /area/survivalpod/superpose/SurvivalDIY_11x11) "u" = ( @@ -196,7 +194,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, @@ -321,8 +319,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/carbine, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun, /obj/item/weapon/cell/device/weapon{ pixel_x = -2; pixel_y = -2 diff --git a/modular_chomp/maps/submaps/shelters/SurvivalDIY-7x7.dmm b/modular_chomp/maps/submaps/shelters/SurvivalDIY-7x7.dmm index 6c69ebde51..d992c103a0 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalDIY-7x7.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalDIY-7x7.dmm @@ -1,5 +1,5 @@ "a" = (/obj/structure/closet/crate,/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil/green,/obj/item/stack/cable_coil/blue,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_7x7) -"c" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_7x7) +"c" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_7x7) "d" = (/obj/machinery/autolathe,/obj/item/weapon/rcd/loaded{pixel_x = -4; pixel_y = 10},/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_7x7) "g" = (/obj/structure/inflatable/door,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_7x7) "h" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_7x7) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalDIY-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalDIY-9x9.dmm index fb3137b859..acb4ef5f77 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalDIY-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalDIY-9x9.dmm @@ -3,8 +3,8 @@ "g" = (/obj/machinery/autolathe,/obj/item/weapon/rcd/loaded{pixel_x = -4; pixel_y = 10},/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) "h" = (/obj/structure/inflatable,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) "i" = (/obj/structure/closet/secure_closet/engineering_welding{locked = 0},/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) -"o" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) -"q" = (/obj/vehicle/train/engine/quadbike/built{dir = 4},/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) +"o" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) +"q" = (/obj/vehicle/train/engine/quadbike/built,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) "u" = (/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) "y" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) "z" = (/obj/structure/closet/toolcloset,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/module/id_auth,/obj/item/weapon/module/card_reader,/obj/item/weapon/module/cell_power,/obj/item/weapon/module/power_control,/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/mass_driver,/obj/item/weapon/circuitboard/jukebox,/obj/item/weapon/circuitboard/intercom,/obj/item/weapon/circuitboard/firealarm,/obj/item/weapon/circuitboard/airalarm,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/belt/utility/full/multitool,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/device/geiger,/obj/item/device/mapping_unit,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalDIY_9x9) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm index b6496f1d27..2f7afda817 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalEngineering-9x9.dmm @@ -19,9 +19,9 @@ "t" = (/obj/machinery/autolathe,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalEngineering) "u" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/shieldgen,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalEngineering) "v" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/vending/engivend{pixel_x = -1},/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalEngineering) -"w" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalEngineering) +"w" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalEngineering) "x" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille,/obj/structure/curtain/black,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalEngineering) -"y" = (/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalEngineering) +"y" = (/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalEngineering) "z" = (/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalEngineering) "A" = (/obj/structure/sign/mining/survival,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalEngineering) "B" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalEngineering) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalHome-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalHome-9x9.dmm index 9095423f99..5d4eb569ca 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalHome-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalHome-9x9.dmm @@ -109,12 +109,12 @@ pixel_x = -4 }, /obj/item/weapon/storage/box/donkpockets{ - pixel_y = -3; - pixel_x = -7 + pixel_x = -7; + pixel_y = -3 }, /obj/item/weapon/storage/box/donkpockets{ - pixel_y = -3; - pixel_x = 7 + pixel_x = 7; + pixel_y = -3 }, /turf/simulated/shuttle/floor/voidcraft/dark, /area/survivalpod/superpose/SurvivalHome) @@ -146,7 +146,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, /obj/item/weapon/reagent_containers/food/snacks/sosjerky, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/accessory/permit/gun, /obj/item/device/camera, diff --git a/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm index 3a6e209031..720fa47071 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalHydro-9x9.dmm @@ -1,5 +1,5 @@ "a" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/bucket{pixel_x = -6; pixel_y = 7},/obj/item/weapon/reagent_containers/glass/bucket{pixel_x = 6; pixel_y = 7},/obj/structure/sink/kitchen{layer = 1; pixel_y = 12},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalHydro) -"c" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalHydro) +"c" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalHydro) "d" = (/obj/structure/fans/tiny,/obj/effect/floor_decal/industrial/danger/full,/obj/machinery/door/airlock/voidcraft/vertical,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalHydro) "e" = (/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalHydro) "f" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalHydro) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm index 62cd7d950d..5e4658cd13 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalLeisure-9x9.dmm @@ -1,6 +1,6 @@ "a" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/boxing{name = "yoga mat"},/area/survivalpod/superpose/SurvivalLeisure) "b" = (/obj/structure/bed/chair/oldsofa{dir = 5},/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalLeisure) -"c" = (/obj/effect/floor_decal/spline/plain{dir = 8},/obj/structure/fans{pixel_y = 16},/obj/machinery/smartfridge/survival_pod{icon = 'icons/obj/vending.dmi'; icon_base = "smartfridge"; icon_contents = "boxes"; icon_state = "smartfridge"; name = "Advanced storage"; pixel_y = -14},/obj/structure/table/reinforced,/obj/item/weapon/tool/wrench,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/gloves/boxing,/obj/item/clothing/gloves/boxing/blue,/obj/item/weapon/material/twohanded/baseballbat/foam,/obj/item/weapon/material/sword/foam,/obj/item/weapon/material/twohanded/fireaxe/foam,/obj/item/weapon/material/twohanded/spear/foam,/obj/item/paint_palette{pixel_y = 6; pixel_x = 6},/obj/item/paint_palette{pixel_y = 6; pixel_x = 6},/obj/item/paint_brush{pixel_y = 4; pixel_x = -8},/obj/item/paint_brush{pixel_y = 4; pixel_x = -8},/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/device/camera,/obj/item/weapon/storage/photo_album,/obj/item/weapon/storage/fancy/crayons{pixel_y = -3; pixel_x = 11},/obj/item/weapon/storage/fancy/crayons{pixel_y = -3; pixel_x = 11},/obj/item/weapon/storage/fancy/markers{pixel_y = 6; pixel_x = 11},/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/weapon/hand_labeler,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalLeisure) +"c" = (/obj/effect/floor_decal/spline/plain{dir = 8},/obj/structure/fans{pixel_y = 16},/obj/machinery/smartfridge/survival_pod{icon = 'icons/obj/vending.dmi'; icon_base = "smartfridge"; icon_contents = "boxes"; icon_state = "smartfridge"; name = "Advanced storage"; pixel_y = -14},/obj/structure/table/reinforced,/obj/item/weapon/tool/wrench,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle{pixel_x = -4; pixel_y = 6},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/weapon/towel/random{pixel_y = 8},/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/footwraps,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/gloves/boxing,/obj/item/clothing/gloves/boxing/blue,/obj/item/weapon/material/twohanded/baseballbat/foam,/obj/item/weapon/material/sword/foam,/obj/item/weapon/material/twohanded/fireaxe/foam,/obj/item/weapon/material/twohanded/spear/foam,/obj/item/paint_palette{pixel_x = 6; pixel_y = 6},/obj/item/paint_palette{pixel_x = 6; pixel_y = 6},/obj/item/paint_brush{pixel_x = -8; pixel_y = 4},/obj/item/paint_brush{pixel_x = -8; pixel_y = 4},/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/device/camera,/obj/item/weapon/storage/photo_album,/obj/item/weapon/storage/fancy/crayons{pixel_x = 11; pixel_y = -3},/obj/item/weapon/storage/fancy/crayons{pixel_x = 11; pixel_y = -3},/obj/item/weapon/storage/fancy/markers{pixel_x = 11; pixel_y = 6},/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/weapon/hand_labeler,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalLeisure) "d" = (/obj/structure/easel,/obj/item/canvas/twentythree_nineteen,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLeisure) "e" = (/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalLeisure) "f" = (/obj/effect/floor_decal/spline/plain,/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLeisure) @@ -24,9 +24,9 @@ "x" = (/obj/structure/sign/mining,/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalLeisure) "y" = (/obj/structure/sign/mining/survival{dir = 1},/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalLeisure) "z" = (/obj/structure/bookcase{name = "bookcase (Reference)"},/obj/item/weapon/book/codex/lore/robutt,/obj/item/weapon/book/bundle/custom_library/fiction/metalglen,/obj/item/weapon/book/bundle/custom_library/fiction/silence,/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat,/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLeisure) -"A" = (/obj/item/weapon/deck/cah{pixel_x = 2; pixel_y = 2},/obj/item/weapon/deck/cah/black{pixel_x = -2; pixel_y = -2},/obj/item/weapon/deck/cards{pixel_y = 5; pixel_x = -4},/obj/structure/table/hardwoodtable,/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalLeisure) +"A" = (/obj/item/weapon/deck/cah{pixel_x = 2; pixel_y = 2},/obj/item/weapon/deck/cah/black{pixel_x = -2; pixel_y = -2},/obj/item/weapon/deck/cards{pixel_x = -4; pixel_y = 5},/obj/structure/table/hardwoodtable,/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalLeisure) "B" = (/obj/structure/bed/chair/oldsofa/left{dir = 1},/obj/effect/floor_decal/spline/plain{dir = 4},/turf/simulated/floor/carpet,/area/survivalpod/superpose/SurvivalLeisure) -"C" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/structure/table/woodentable,/obj/item/paint_palette{pixel_y = 6; pixel_x = 6},/obj/item/paint_brush{pixel_y = 4; pixel_x = -8},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLeisure) +"C" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/structure/table/woodentable,/obj/item/paint_palette{pixel_x = 6; pixel_y = 6},/obj/item/paint_brush{pixel_x = -8; pixel_y = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLeisure) "D" = (/obj/structure/easel,/obj/item/canvas/twentythree_twentythree,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLeisure) "E" = (/obj/structure/fitness/weightlifter,/obj/structure/window/reinforced/survival_pod{dir = 1},/turf/simulated/floor/boxing/gym,/area/survivalpod/superpose/SurvivalLeisure) "F" = (/obj/effect/floor_decal/spline/plain{dir = 8},/obj/machinery/scale,/turf/simulated/floor/boxing/gym,/area/survivalpod/superpose/SurvivalLeisure) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalLuxuryBar-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalLuxuryBar-11x11.dmm index 406207eaaf..b39ee40e9e 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalLuxuryBar-11x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalLuxuryBar-11x11.dmm @@ -12,7 +12,7 @@ "is" = (/obj/structure/bed/chair/sofa/black,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) "jv" = (/obj/structure/fans/tiny,/obj/effect/floor_decal/industrial/danger/full,/obj/machinery/door/airlock/voidcraft/vertical,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalLuxuryBar) "jC" = (/obj/machinery/vending/foodfast,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalLuxuryBar) -"kZ" = (/obj/structure/urinal{dir = 4; pixel_y = 0; pixel_x = -31},/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) +"kZ" = (/obj/structure/urinal{dir = 4; pixel_x = -31},/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) "lj" = (/obj/structure/bed/chair/comfy/black,/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "lp" = (/obj/structure/fans,/obj/machinery/computer/security/telescreen/entertainment{pixel_y = 28},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) "lE" = (/obj/structure/table/bench/glass,/obj/structure/closet/walllocker_double/survival/west,/obj/item/clothing/under/swimsuit/stripper/stripper_pink,/obj/item/clothing/mask/muzzle/ballgag/ringgag,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) @@ -30,23 +30,23 @@ "xR" = (/obj/structure/disposalpipe/segment,/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalLuxuryBar) "zq" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille,/obj/structure/curtain/black,/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalLuxuryBar) "zW" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) -"As" = (/obj/machinery/disposal/wall{dir = 8; pixel_y = 0; pixel_x = 35},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalLuxuryBar) +"As" = (/obj/machinery/disposal/wall{dir = 8; pixel_x = 35},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalLuxuryBar) "BC" = (/obj/structure/bed/chair/comfy/black,/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "Cg" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "Di" = (/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) -"Dy" = (/obj/structure/bed/chair/sofa/left/black{dir = 2},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) +"Dy" = (/obj/structure/bed/chair/sofa/left/black,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) "DK" = (/obj/structure/table/reinforced,/obj/structure/reagent_dispensers/beerkeg,/obj/machinery/light{dir = 4},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) "DN" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/machinery/light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "DX" = (/obj/structure/bed/chair/sofa/right/black,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) "ET" = (/obj/machinery/door/airlock/voidcraft/survival_pod,/obj/structure/fans/tiny,/obj/effect/floor_decal/industrial/danger/full,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "shelterblast"; name = "Shelter Blast Doors"; opacity = 0},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalLuxuryBar) -"EY" = (/obj/structure/sink{pixel_y = 14},/obj/structure/mirror{pixel_y = 32},/obj/machinery/disposal/wall{dir = 4; pixel_y = 0; pixel_x = -37},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) +"EY" = (/obj/structure/sink{pixel_y = 14},/obj/structure/mirror{pixel_y = 32},/obj/machinery/disposal/wall{dir = 4; pixel_x = -37},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) "Gg" = (/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "GB" = (/obj/structure/table/bench/glass,/obj/item/weapon/handcuffs/legcuffs/fuzzy,/obj/item/weapon/handcuffs/fuzzy,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) "GF" = (/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalLuxuryBar) -"GH" = (/obj/structure/table/hardwoodtable,/obj/structure/stripper_pole{pixel_y = 9},/obj/structure/mirror{dir = 1; pixel_y = -27},/obj/item/clothing/under/swimsuit/stripper/mankini{pixel_y = 5; pixel_x = -6},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) +"GH" = (/obj/structure/table/hardwoodtable,/obj/structure/stripper_pole{pixel_y = 9},/obj/structure/mirror{dir = 1; pixel_y = -27},/obj/item/clothing/under/swimsuit/stripper/mankini{pixel_x = -6; pixel_y = 5},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) "HE" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/structure/closet/walllocker_double/survival/west,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "HS" = (/obj/structure/table/fancyblack,/obj/item/device/paicard,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) -"Ij" = (/obj/structure/table/hardwoodtable,/obj/structure/stripper_pole{pixel_y = 9},/obj/structure/mirror{dir = 1; pixel_y = -27},/obj/item/clothing/under/fluff/latexmaid{pixel_y = 7; pixel_x = -8},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) +"Ij" = (/obj/structure/table/hardwoodtable,/obj/structure/stripper_pole{pixel_y = 9},/obj/structure/mirror{dir = 1; pixel_y = -27},/obj/item/clothing/under/fluff/latexmaid{pixel_x = -8; pixel_y = 7},/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalLuxuryBar) "IN" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalLuxuryBar) "IT" = (/obj/structure/sink/kitchen{dir = 8; pixel_x = -13},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) "JT" = (/obj/structure/table/reinforced,/obj/item/weapon/flame/lighter/random{pixel_x = -4; pixel_y = 4},/obj/item/weapon/flame/lighter/random,/obj/machinery/light{dir = 8},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) @@ -57,21 +57,21 @@ "LX" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) "MV" = (/obj/structure/sink{pixel_y = 14},/obj/structure/mirror{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) "Nl" = (/turf/simulated/shuttle/wall/voidcraft/survival,/area/survivalpod/superpose/SurvivalLuxuryBar) -"Nv" = (/obj/structure/urinal{dir = 4; pixel_y = 0; pixel_x = -31},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) +"Nv" = (/obj/structure/urinal{dir = 4; pixel_x = -31},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) "NJ" = (/obj/structure/table/fancyblack,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = -4; pixel_y = 12},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = -32},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "Ol" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalLuxuryBar) "OA" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/industrial/warning,/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalLuxuryBar) "Pr" = (/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) "Pv" = (/obj/structure/disposalpipe/segment,/obj/structure/sign/mining/survival{dir = 4},/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalLuxuryBar) "RE" = (/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille,/obj/structure/curtain/black,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/survivalpod/superpose/SurvivalLuxuryBar) -"RR" = (/obj/structure/toilet{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/curtain/bed{name = "Bathroom curtain"; icon_state = "open"; opacity = 0; dir = 2; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) +"RR" = (/obj/structure/toilet{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/curtain/bed{icon_state = "open"; name = "Bathroom curtain"; opacity = 0},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) "RS" = (/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalLuxuryBar) "RV" = (/obj/structure/bed/chair/comfy/black,/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/structure/closet/walllocker_double/survival/west,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "Ub" = (/obj/structure/table/fancyblack,/obj/item/toy/eight_ball,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "Uu" = (/obj/structure/table/fancyblack,/obj/item/weapon/deck/cah{pixel_x = 2; pixel_y = 2},/obj/item/weapon/deck/cah/black{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "Wq" = (/obj/structure/sign/mining/survival,/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalLuxuryBar) "WL" = (/obj/item/device/gps/computer,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) -"XG" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/gun/energy/locked/frontier/carbine,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) +"XG" = (/obj/machinery/smartfridge/survival_pod,/obj/item/weapon/tape_roll,/obj/item/sticky_pad/random,/obj/item/weapon/pen/blue,/obj/item/weapon/pen/blue,/obj/item/fulton_core,/obj/item/fulton_core,/obj/item/extraction_pack,/obj/item/extraction_pack,/obj/item/modular_computer/laptop/preset/custom_loadout/standard,/obj/item/weapon/pickaxe/hand,/obj/item/device/flashlight/color/yellow,/obj/item/device/flashlight/color/orange,/obj/item/device/threadneedle,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/flame/lighter/zippo,/obj/item/device/flashlight/lantern,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/pill_bottle/spaceacillin,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/device/healthanalyzer,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/o2,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/stack/nanopaste,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/suit_cooling_unit/emergency,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/box/survival/space,/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/box/flare,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/stack/marker_beacon/ten,/obj/item/device/starcaster_news,/obj/item/device/mapping_unit,/obj/item/weapon/storage/box/dosimeter,/obj/item/device/gps,/obj/item/device/gps,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/device/pda,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/weapon/cell/device/weapon{pixel_x = -2; pixel_y = -2},/obj/item/clothing/accessory/permit/gun,/obj/item/clothing/accessory/permit/gun,/obj/item/weapon/material/knife/machete,/obj/item/weapon/material/fishing_net,/obj/item/weapon/storage/backpack/sport,/obj/item/weapon/storage/backpack/sport,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/storage/belt,/obj/item/clothing/accessory/poncho/thermal,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalLuxuryBar) "Ym" = (/obj/structure/table/fancyblack,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = -4; pixel_y = 12},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/SurvivalLuxuryBar) "ZS" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalLuxuryBar) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalLuxuryHome-11x11.dmm b/modular_chomp/maps/submaps/shelters/SurvivalLuxuryHome-11x11.dmm index 76d888df6e..db3767ecd8 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalLuxuryHome-11x11.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalLuxuryHome-11x11.dmm @@ -354,8 +354,8 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/carbine, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun, /obj/item/weapon/cell/device/weapon{ pixel_x = -2; pixel_y = -2 diff --git a/modular_chomp/maps/submaps/shelters/SurvivalMedical-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalMedical-9x9.dmm index 1f1d5dd1c8..8d2e8d32d1 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalMedical-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalMedical-9x9.dmm @@ -203,8 +203,8 @@ /obj/structure/closet/secure_closet/guncabinet/phase{ pixel_y = -32 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout, -/obj/item/weapon/gun/energy/locked/frontier/holdout, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, +/obj/item/weapon/gun/energy/locked/phasegun/pistol, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/accessory/holster/waist, diff --git a/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm index b8d6be66e6..f01a26a107 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalQuarters-9x9.dmm @@ -13,13 +13,13 @@ "n" = (/obj/structure/sign/nosmoking_2{pixel_x = 30},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalQuarters) "o" = (/obj/machinery/shower{pixel_y = 16},/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalQuarters) "p" = (/obj/structure/sign/mining,/turf/simulated/shuttle/wall/voidcraft/green,/area/survivalpod/superpose/SurvivalQuarters) -"q" = (/obj/structure/closet/walllocker_double/south{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) +"q" = (/obj/structure/closet/walllocker_double/south{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) "r" = (/obj/machinery/vending/wallmed1{dir = 4; pixel_x = -23},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalQuarters) "s" = (/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalQuarters) "t" = (/obj/structure/bed/double,/obj/item/weapon/bedsheet/iandouble,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) "u" = (/turf/simulated/shuttle/wall/voidcraft/survival/hard_corner,/area/survivalpod/superpose/SurvivalQuarters) "v" = (/obj/effect/floor_decal/industrial/loading{dir = 1},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalQuarters) -"w" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) +"w" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) "x" = (/obj/machinery/door/airlock/maintenance/common{name = "Dorm"},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalQuarters) "y" = (/obj/structure/bed/pod,/obj/item/weapon/bedsheet/yellow,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) "z" = (/obj/machinery/power/apc/alarms_hidden{dir = 4; pixel_x = 20},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalQuarters) @@ -40,7 +40,7 @@ "O" = (/obj/structure/mirror{dir = 1; pixel_y = -27},/obj/structure/sink{dir = 1; pixel_y = -9},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalQuarters) "P" = (/obj/machinery/door/window/survival_pod,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalQuarters) "R" = (/obj/machinery/newscaster{pixel_x = 30},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalQuarters) -"S" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/device/starcaster_news,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) +"S" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/device/starcaster_news,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/weapon/storage/mre/menu11,/obj/item/weapon/storage/mre/menu11,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/turf/simulated/floor/wood,/area/survivalpod/superpose/SurvivalQuarters) "U" = (/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/toilet{dir = 4},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/SurvivalQuarters) "V" = (/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalQuarters) "W" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalQuarters) diff --git a/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm b/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm index 8f725cb2df..d9ddb58be1 100644 --- a/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm +++ b/modular_chomp/maps/submaps/shelters/SurvivalScience-9x9.dmm @@ -42,13 +42,13 @@ "Ko" = (/obj/structure/table/reinforced,/obj/item/modular_computer/laptop/preset/custom_loadout/advanced,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalScience) "Mf" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/machinery/power/apc/alarms_hidden{dir = 4; pixel_x = 20},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalScience) "Nt" = (/obj/machinery/mech_recharger,/obj/machinery/newscaster{layer = 3.3; pixel_y = -27},/obj/mecha/medical/odysseus/old,/obj/effect/floor_decal/industrial/warning/full,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalScience) -"NV" = (/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = -30},/obj/structure/sink/kitchen{dir = 8; pixel_x = -13},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalScience) +"NV" = (/obj/structure/reagent_dispensers/acid{pixel_x = -30},/obj/structure/sink/kitchen{dir = 8; pixel_x = -13},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalScience) "PD" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalScience) "Qx" = (/obj/machinery/mecha_part_fabricator/pros,/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalScience) "TK" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/shuttle/plating/skipjack,/area/survivalpod/superpose/SurvivalScience) -"TY" = (/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/weapon/gun/energy/locked/frontier/holdout,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalScience) +"TY" = (/obj/structure/closet/secure_closet/guncabinet/phase{pixel_y = -32},/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/holster/waist,/obj/item/clothing/accessory/holster/waist,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalScience) "Vp" = (/obj/structure/window/reinforced/survival_pod{opacity = 1},/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/clipboard,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/item/weapon/reagent_containers/dropper{pixel_y = -4},/turf/simulated/shuttle/floor/voidcraft/light,/area/survivalpod/superpose/SurvivalScience) -"VG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; icon_state = "map_vent_out"; use_power = 1},/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/SurvivalScience) +"VG" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; icon_state = "map_vent_out"; use_power = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/bluegrid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/survivalpod/superpose/SurvivalScience) "Yk" = (/obj/machinery/mech_recharger,/obj/effect/floor_decal/industrial/warning/full,/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/SurvivalScience) "Zq" = (/obj/machinery/atmospherics/unary/freezer{dir = 8; icon_state = "freezer_1"; power_setting = 20; set_temperature = 73; use_power = 1},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/SurvivalScience) diff --git a/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm b/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm index ba8f5cb0c7..08442097b7 100644 --- a/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm +++ b/modular_chomp/maps/submaps/shelters/TinyCombatShip-9x7.dmm @@ -11,7 +11,7 @@ "s" = (/obj/structure/window/plastitanium/full,/obj/structure/window/reinforced/survival_pod{dir = 4},/obj/structure/window/reinforced/survival_pod{dir = 8},/obj/structure/window/reinforced/survival_pod{dir = 1},/obj/structure/window/reinforced/survival_pod,/obj/structure/grille/rustic{health = 25; name = "reinforced grille"},/obj/machinery/door/blast/regular/open{dir = 4; id = "stargazer_blast"; name = "window blast shield"},/turf/simulated/shuttle/plating,/area/survivalpod/superpose/TinyCombatShip) "t" = (/obj/effect/catwalk_plated/dark,/turf/template_noop,/area/survivalpod/superpose/TinyCombatShip) "u" = (/obj/machinery/disperser/middle{dir = 1},/turf/template_noop,/area/template_noop) -"x" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/kitchen/east{name = "Ration Cabinet"},/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/TinyCombatShip) +"x" = (/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/obj/structure/closet/walllocker_double/kitchen/east{name = "Ration Cabinet"},/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/TinyCombatShip) "D" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/shuttle/floor/voidcraft,/area/survivalpod/superpose/TinyCombatShip) "F" = (/obj/machinery/portable_atmospherics/canister/phoron,/obj/machinery/atmospherics/portables_connector{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/survivalpod/superpose/TinyCombatShip) "H" = (/obj/structure/bed/chair/bay/comfy/red{dir = 1},/obj/machinery/door/window/survival_pod{dir = 2},/turf/simulated/floor/tiled/techmaint,/area/survivalpod/superpose/TinyCombatShip) diff --git a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm index fb72773703..58b004eb45 100644 --- a/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm +++ b/modular_chomp/maps/submaps/shelters/TradingShip-40x22.dmm @@ -41,7 +41,7 @@ "kO" = (/obj/machinery/door/window/northleft{name = "Cargo Hold"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/survivalpod/superpose/TradingShip) "kU" = (/obj/machinery/access_button{master_tag = null; pixel_x = 27; pixel_y = -7; req_one_access = null},/obj/machinery/door/airlock/external{frequency = null; icon_state = "door_locked"; id_tag = null; locked = 1; name = "Ship Hatch"; req_access = null},/obj/structure/fans/hardlight,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/TradingShip) "kV" = (/obj/structure/table/woodentable,/obj/item/weapon/card/id/external{access = list(160)},/obj/item/weapon/card/id/external{access = list(160)},/obj/item/weapon/card/id/external{access = list(160)},/turf/simulated/floor/carpet,/area/survivalpod/superpose/TradingShip) -"lm" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/shuttle/floor/black,/area/survivalpod/superpose/TradingShip) +"lm" = (/obj/structure/closet/walllocker_double/north,/obj/item/device/gps,/obj/item/sticky_pad/random,/obj/item/device/starcaster_news,/obj/item/weapon/pen/blue,/obj/item/device/pda,/obj/item/weapon/card/id/external,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/clothing/accessory/permit/gun,/obj/item/device/camera,/obj/item/device/binoculars,/obj/item/device/threadneedle,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/bodybag/cryobag,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/color/yellow,/obj/item/device/radio,/obj/item/device/radio,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/weapon/reagent_containers/pill/spaceacillin,/obj/item/device/fbp_backup_cell,/obj/item/device/fbp_backup_cell,/obj/item/device/suit_cooling_unit/emergency,/obj/item/stack/nanopaste,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/weapon/storage/backpack/messenger,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/clothing/accessory/poncho/thermal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/storage/toolbox/brass,/obj/item/weapon/storage/box/khcrystal,/turf/simulated/shuttle/floor/black,/area/survivalpod/superpose/TradingShip) "lv" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradeportshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/full,/turf/simulated/shuttle/plating,/area/survivalpod/superpose/TradingShip) "lQ" = (/obj/structure/fans/hardlight,/turf/simulated/shuttle/floor/voidcraft/dark,/area/survivalpod/superpose/TradingShip) "lW" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor/black,/area/survivalpod/superpose/TradingShip)