diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 69d11fdf..a297da05 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1,4 +1,4 @@ -"aa" = (/turf/closed/mineral/random/volcanic,/area/ruin/unpowered/syndicate_lava_base/outdoors) +"aa" = (/turf/closed/mineral/random/volcanic,/area/lavaland/surface/outdoors/unexplored/danger) "ab" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "ac" = (/obj/machinery/porta_turret/syndicate{dir = 5},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/main) "ad" = (/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 4; network = list("ss13","rd")},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) @@ -40,7 +40,7 @@ "aR" = (/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/sign/warning/securearea,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/testlab) "aS" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/arrivals) "aU" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1; external_pressure_bound = 140; name = "killroom vent"; pressure_checks = 0},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab) -"aV" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side,/area/ruin/unpowered/syndicate_lava_base/medbay) +"aV" = (/obj/structure/extinguisher_cabinet{pixel_y = -29},/obj/effect/decal/cleanable/generic,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side,/area/ruin/unpowered/syndicate_lava_base/medbay) "aW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab) "aX" = (/obj/machinery/light{dir = 4; light_color = "#c1caff"},/obj/machinery/camera{c_tag = "Xenobiology Inner South"; dir = 9; network = list("ss13","rd")},/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/testlab) "aY" = (/obj/effect/turf_decal/stripes/line{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/testlab) @@ -232,7 +232,7 @@ "fh" = (/obj/structure/grille,/obj/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/virology) "fi" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/obj/structure/cable/yellow{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) "fj" = (/obj/structure/lattice/catwalk,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) -"fk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/vending/medical/syndicate_access,/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay) +"fk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/vending/medical/syndicate_access,/turf/open/floor/plasteel/white/side,/area/ruin/unpowered/syndicate_lava_base/medbay) "fl" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "fm" = (/turf/open/floor/plasteel/white/corner{dir = 4},/area/ruin/unpowered/syndicate_lava_base/main) "fn" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/main) @@ -484,7 +484,7 @@ "kQ" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/medbay) "kR" = (/obj/structure/closet/secure_closet/medical1{req_access = null; req_access_txt = "150"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/item/defibrillator/compact/combat/loaded,/turf/open/floor/plasteel/white/side{dir = 9},/area/ruin/unpowered/syndicate_lava_base/medbay) "kT" = (/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/medbay) -"kU" = (/obj/structure/table/reinforced,/obj/item/scalpel,/obj/item/circular_saw{pixel_y = 9},/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) +"kU" = (/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/stripes/red/line{dir = 5},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/machinery/cryopod/syndicate{dir = 8},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) "kW" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/engineering) "kX" = (/obj/effect/turf_decal/stripes/line{dir = 6},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/engineering) "kY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) @@ -601,7 +601,7 @@ "nu" = (/obj/machinery/air_sensor{frequency = 1442; id_tag = "syndie_lavaland_n2_sensor"},/turf/open/floor/plating/airless,/area/ruin/unpowered/syndicate_lava_base/engineering) "nw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "ny" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical/glass{dir = 4; name = "Medbay"},/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay) -"nz" = (/turf/open/floor/plasteel/white/side{dir = 10},/area/ruin/unpowered/syndicate_lava_base/medbay) +"nz" = (/turf/open/floor/plasteel/white/side{dir = 8},/area/ruin/unpowered/syndicate_lava_base/medbay) "nB" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/machinery/light/small{dir = 4},/turf/open/floor/plating/airless,/area/ruin/unpowered/syndicate_lava_base/engineering) "nD" = (/obj/machinery/light/small{dir = 8},/obj/machinery/atmospherics/pipe/layer_manifold{dir = 4},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "nE" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava{dir = 8},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) @@ -620,7 +620,7 @@ "nU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "nX" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "oa" = (/obj/machinery/firealarm{dir = 4; pixel_x = 26},/obj/machinery/vending/cigarette{extended_inventory = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) -"ob" = (/obj/structure/rack{dir = 8},/obj/item/storage/belt/medical,/obj/effect/decal/cleanable/dirt,/obj/item/crowbar,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/neck/stethoscope,/turf/open/floor/plasteel/white,/area/ruin/unpowered/syndicate_lava_base/medbay) +"ob" = (/obj/structure/rack{dir = 8},/obj/item/storage/belt/medical,/obj/effect/decal/cleanable/dirt,/obj/item/crowbar,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/neck/stethoscope,/turf/open/floor/plasteel/white/side{dir = 10},/area/ruin/unpowered/syndicate_lava_base/medbay) "oc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/arrivals) "od" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "oe" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/arrivals) @@ -650,11 +650,11 @@ "rF" = (/obj/effect/turf_decal/stripes/corner,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "rO" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 8},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "sl" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/structure/chair,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/arrivals) -"sz" = (/obj/machinery/biogenerator,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"sz" = (/obj/structure/table/reinforced,/obj/item/retractor,/obj/item/hemostat,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side{dir = 6},/area/ruin/unpowered/syndicate_lava_base/medbay) "sZ" = (/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{dir = 1; frequency = 1442; id_tag = "syndie_lavaland_tox_out"; name = "toxin out"},/turf/open/floor/plating/airless,/area/ruin/unpowered/syndicate_lava_base/engineering) "tW" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/binary/pump/on{target_pressure = 4500},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/airlock_sensor/incinerator_syndicatelava{pixel_x = 22},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "us" = (/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green,/obj/item/reagent_containers/glass/bucket,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"ut" = (/obj/structure/table/optable,/obj/item/surgical_drapes,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) +"ut" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/reinforced,/obj/item/scalpel,/obj/item/circular_saw{pixel_y = 9},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) "uB" = (/obj/item/storage/box/donkpockets{pixel_x = -2; pixel_y = 6},/obj/item/storage/box/donkpockets{pixel_y = 3},/obj/item/storage/box/donkpockets{pixel_x = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 9},/obj/structure/cable/yellow{icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{req_access = null},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "uX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 9},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "vx" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{dir = 1},/obj/structure/sign/barsign{pixel_y = -32; req_access = null; req_access_txt = "0"},/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) @@ -669,11 +669,11 @@ "zy" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 2},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/structure/cable/yellow{icon_state = "1-8"},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/arrivals) "zF" = (/obj/machinery/hydroponics/constructable,/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "zV" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Am" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Ax" = (/obj/structure/table/reinforced,/obj/machinery/plantgenes{pixel_y = 6},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Am" = (/obj/machinery/biogenerator,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"Ax" = (/obj/structure/table/reinforced,/obj/machinery/plantgenes{density = 0; pixel_y = 6},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/machinery/light/small{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "AL" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/circuits) "Bk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"CD" = (/obj/structure/table/reinforced,/obj/item/retractor,/obj/item/hemostat,/obj/effect/decal/cleanable/dirt,/obj/machinery/power/apc/syndicate{dir = 4; name = "Medbay APC"; pixel_x = 24},/obj/structure/cable/yellow,/turf/open/floor/plasteel/white/side{dir = 6},/area/ruin/unpowered/syndicate_lava_base/medbay) +"CD" = (/obj/machinery/power/apc/syndicate{dir = 4; name = "Medbay APC"; pixel_x = 24},/obj/structure/cable/yellow,/obj/machinery/computer/operating{dir = 8},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) "CL" = (/obj/machinery/hydroponics/constructable,/obj/structure/window/reinforced{dir = 8},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Dc" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "DG" = (/obj/effect/turf_decal/stripes/line,/obj/machinery/computer/atmos_control/tank{dir = 1; frequency = 1442; name = "Toxins Supply Control"; output_tag = "syndie_lavaland_tox_out"; sensors = list("syndie_lavaland_tox_sensor" = "Tank")},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) @@ -700,18 +700,18 @@ "Qk" = (/obj/item/toy/plush/nukeplushie{desc = "This one seems to be quite worn. It even has a different tag. It reads: Property of Aeterna. Please dry wash only."},/turf/open/floor/circuit/red,/area/ruin/unpowered/syndicate_lava_base/main) "Qm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "QK" = (/obj/machinery/hydroponics/constructable,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Ra" = (/obj/structure/cable/yellow{icon_state = "2-8"},/obj/machinery/computer/operating{dir = 8},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) +"Ra" = (/obj/structure/cable/yellow{icon_state = "2-8"},/obj/structure/table/optable,/obj/item/surgical_drapes,/obj/effect/decal/cleanable/generic,/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) "Rs" = (/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Ru" = (/obj/structure/grille,/obj/structure/window/plastitanium,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/preopen{id = "lavalandsyndi_telecomms"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/telecomms) "RB" = (/obj/structure/cable,/obj/machinery/power/turbine{dir = 2; luminosity = 2},/turf/open/floor/engine/vacuum,/area/ruin/unpowered/syndicate_lava_base/engineering) "RD" = (/obj/machinery/atmospherics/miner/toxins,/obj/machinery/light/small,/turf/open/floor/plating/airless,/area/ruin/unpowered/syndicate_lava_base/engineering) "RV" = (/obj/machinery/atmospherics/pipe/simple/orange/visible,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/engineering) -"RY" = (/obj/machinery/light/small,/obj/structure/extinguisher_cabinet{pixel_y = -29},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/white/side,/area/ruin/unpowered/syndicate_lava_base/medbay) +"RY" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "Su" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "Tf" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/plantbgone{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/spray/plantbgone{pixel_y = 3},/obj/item/book/manual/hydroponics_pod_people,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Ti" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms) "Tp" = (/obj/machinery/door/airlock/maintenance,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/main) -"TB" = (/obj/structure/table/reinforced,/obj/machinery/smartfridge/disks{pixel_y = 2},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"TB" = (/obj/structure/table/reinforced,/obj/machinery/smartfridge/disks{density = 0; pixel_y = 2},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Ug" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "UM" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Wt" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 10},/obj/structure/noticeboard{dir = 8; pixel_x = 27},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/telecomms) @@ -761,10 +761,10 @@ aaabababababababababababhalwlwjyjyoHjZlzlAlBlCaklElFuBjyjDkQlHlImElKkQlLlMlNlOEZ aaababababmnmnmnRuRuRuRumnlTgsmOjynSlVlWlXlYlZmajymcjyjyTpkQmeUgmfYjkUncmhmimjmkmlDGjujujujuabababaa aaabababiimnmMmnmpmpIaNZmnmsmsmTjymvmumvjyvxmxjyjyjyjymzocmAmBmCmEmEutncmGmHmImJmKnjjuababababababaa aaabababmnmMmMmPTimQmRWtmSzVzVyqmUmUEFZvjyjyMnjyvDXamXmYzymZnauXnbnbRancjuneRVngsZNHjuababababababaa -aaabababmnFbnkaEnknlnmmonnrFnonpBkamnrpiQmjPJAnsntRsfDnwhWnynzaVRYcDCDZInDnEtWnFnGRDjuababababababaa -aaabababmnmMmMmnnInJnKnLmnmTnQmTfPfPaoarPanTnUnXnXnXfKauhXmTobfkkQkQkQjujuofOYjujujuhBababababababaa -aaabababgmmnmMmnoiojokmnmnmTGYPaPaPaPaJccIPamTgWgWgWgWgXmTmTmTmTmTszXLmTotFlFRpVabababababababababaa -aaababababmnmnmnmnmnmnhBslaSxOPaPxALcJcKxTxFmTgYusCLcLDcwNQKxnzFmTiyAmmTjuoBjuoGabababababababababaa +aaabababmnFbnkaEnknlnmmonnrFnonpBkamnrpiQmjPJAnsntRsfDnwhWnynzloRYmECDZInDnEtWnFnGRDjuababababababaa +aaabababmnmMmMmnnInJnKnLmnmTnQmTfPfPaoarPanTnUnXnXnXfKauhXmTobfkaVcDszjujuofOYjujujuhBababababababaa +aaabababgmmnmMmnoiojokmnmnmTGYPaPaPaPaJccIPamTgWgWgWgWgXmTmTmTmTmTmTmTmTotFlFRpVabababababababababaa +aaababababmnmnmnmnmnmnhBslaSxOPaPxALcJcKxTxFmTgYusCLcLDcwNQKxnzFmTXLAmmTjuoBjuoGabababababababababaa aaababababababababababdGcOcPOvPacRcUcVdjdmPEmThcdthbhbhFhmhmelpYemiyAxmTjuRBjuababababababababababaa aaaaabababababababababdGdGdGdGgmPaeKeLeMeNPamThqeQrOflfzUMhrhrfLXmfMTBmToGHzoGababababababababababaa aaaaababababababababababababababPafTfTfTfTPamTfVhshuhtgehuLXgigjmTgkTfmTabababababababababababababaa diff --git a/modular_citadel/code/game/machinery/cryopod.dm b/modular_citadel/code/game/machinery/cryopod.dm index 363067cc..c0818e90 100644 --- a/modular_citadel/code/game/machinery/cryopod.dm +++ b/modular_citadel/code/game/machinery/cryopod.dm @@ -140,6 +140,8 @@ var/obj/machinery/computer/cryopod/control_computer var/last_no_computer_message = 0 + var/alert_comms = TRUE //If we alert crew who cryo'd + // These items are preserved when the process() despawn proc occurs. var/list/preserve_items = list( /obj/item/hand_tele, @@ -299,7 +301,7 @@ if(control_computer) control_computer.frozen_crew += "[mob_occupant.real_name]" - if(GLOB.announcement_systems.len) + if(GLOB.announcement_systems.len && alert_comms) var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems) announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, announce_job_title, list()) visible_message("\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.") @@ -410,3 +412,33 @@ //Attacks/effects. /obj/machinery/cryopod/blob_act() return //Sorta gamey, but we don't really want these to be destroyed. + + +// Syndie Cryo +//DT: I wanted to make a new object instead of make a typepath of the cryopod, but there's something somewhere that +//handles the occupant var. IDK where that is. This is good either way, but syndicates may show up on the cryopod consoles +/obj/machinery/cryopod/syndicate + name = "subspace cryogenic sleeper" + desc = "A special mobility sleeper for storing agents in a disclosed location." + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper_s-open" + alert_comms = FALSE + +/obj/machinery/cryopod/syndicate/find_control_computer() //We don't want to store anything + return + +/obj/machinery/cryopod/syndicate/MouseDrop_T(mob/living/target, mob/user) + if(!isliving(target)) + return + if(!target.faction.Find("Syndicate")) + to_chat(user, "The machine's internal checks prevent you from putting [target == user ? "yourself" : "[target]"] inside.") + return + ..() + +/obj/machinery/cryopod/syndicate/open_machine() + ..() + icon_state = "sleeper_s-open" + +/obj/machinery/cryopod/syndicate/close_machine(mob/user) + ..() + icon_state = "sleeper_s" \ No newline at end of file