diff --git a/code/datums/autolathe/general_ch.dm b/code/datums/autolathe/general_ch.dm new file mode 100644 index 0000000000..e33f5d2f26 --- /dev/null +++ b/code/datums/autolathe/general_ch.dm @@ -0,0 +1,3 @@ +/datum/category_item/autolathe/general/radio_subspace + name = "subspace radio" + path =/obj/item/device/radio/subspace \ No newline at end of file diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index dd653d746a..7ade7f54b1 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -835,7 +835,18 @@ TLV["temperature"] = list(T0C - 40, T0C - 20, T0C + 40, T0C + 66) // K, Lower Temperature for Freezer Air Alarms (This is because TLV is hardcoded to be generated on first_run, and therefore the only way to modify this without changing TLV generation) -// VOREStation Edit End +// VOREStation Edit End, CHOMPEdit START +/obj/machinery/alarm/sifwilderness + breach_detection = 0 + report_danger_level = 0 + +/obj/machinery/alarm/sifwilderness/first_run() + . = ..() + + TLV["oxygen"] = list(16, 17, 135, 140) + TLV["pressure"] = list(0,ONE_ATMOSPHERE*0.10,ONE_ATMOSPHERE*1.50,ONE_ATMOSPHERE*1.60) + TLV["temperature"] = list(T0C - 40, T0C - 31, T0C + 40, T0C + 120) +// CHOMPEdit END #undef LOAD_TLV_VALUES #undef TEST_TLV_VALUES #undef DECLARE_TLV_VALUES \ No newline at end of file diff --git a/code/game/machinery/airconditioner_ch.dm b/code/game/machinery/airconditioner_ch.dm new file mode 100644 index 0000000000..947c9eef60 --- /dev/null +++ b/code/game/machinery/airconditioner_ch.dm @@ -0,0 +1,74 @@ +#define MODE_IDLE 0 +#define MODE_HEATING 1 +#define MODE_COOLING 2 +/obj/machinery/power/thermoregulator/southerncross + name = "Custom Thermal Regulator" + desc = "A massive custom made Thermal regulator or CTR for short, intended to keep heat loss when going in our outside to a minimum." + icon = 'icons/obj/machines/wallthermal.dmi' + icon_state = "lasergen" + density = 0 + anchored = 1 + //Consider making this powered by the room at some point. + use_power = 0 //is powered directly from cables + active_power_usage = 250 // VERY low power use + idle_power_usage = 250 + + circuit = null + /* + null so people can not deconstruct them and remake them to normal Regulators, + probably should just make a circuit for it but this is pretty much just a proof of concept at the moment. + */ + +/obj/machinery/power/thermoregulator/southerncross/process() + if(!on) + return + if(!powernet) + turn_off() + return + + /* DON'T CARE, DIDN'T ASK. YOU WILL PERFORM THE MACGUFFIN HEAT EXCHANGE AND NOT POWER DOWN UNTIL YOU ARE TOLD TO! + if(draw_power(idle_power_usage) < idle_power_usage) + visible_message("\The [src] shuts down.") + turn_off() + return + */ + + var/datum/gas_mixture/env = loc.return_air() + if(!env || abs(env.temperature - target_temp) < 1) + change_mode(MODE_IDLE) + return + + var/datum/gas_mixture/removed = env.remove_ratio(0.99) + if(!removed) + change_mode(MODE_IDLE) + return + + var/heat_transfer = removed.get_thermal_energy_change(target_temp) + // var/power_avail + if(heat_transfer == 0) //just in case + change_mode(MODE_IDLE) + else if(heat_transfer > 0) + change_mode(MODE_HEATING) + // power_avail = draw_power(min(heat_transfer, active_power_usage)) + removed.add_thermal_energy(min(active_power_usage*1000,heat_transfer)) + else + change_mode(MODE_COOLING) + heat_transfer = abs(heat_transfer) + var/cop = removed.temperature/TN60C + var/actual_heat_transfer = heat_transfer + heat_transfer = min(heat_transfer, active_power_usage*cop) + // power_avail = draw_power(heat_transfer/cop) + removed.add_thermal_energy(-min(active_power_usage*1000*cop,actual_heat_transfer)) + env.merge(removed) + +// Given the power behind this thermodynamics defying machine, nerfing EMP effectiveness. +/obj/machinery/power/thermoregulator/southerncross/emp_act(severity) + if(!on) + on = 1 + target_temp += rand(0, 20) + update_icon() + ..(severity) + +#undef MODE_IDLE +#undef MODE_HEATING +#undef MODE_COOLING \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/radio_ch.dm b/code/game/objects/items/devices/radio/radio_ch.dm index aa4759823f..08b3b624f9 100644 --- a/code/game/objects/items/devices/radio/radio_ch.dm +++ b/code/game/objects/items/devices/radio/radio_ch.dm @@ -49,4 +49,27 @@ if(!broadcast_tiles) update_broadcast_tiles() return broadcast_tiles -#undef CANBROADCAST_INNERBOX + +//*Subspace Radio*// +/obj/item/device/radio/subspace + adhoc_fallback = 1 + canhear_range = 8 + desc = "A heavy duty radio that can pick up all manor of shortwave and subspace frequencies. It's a bit bulkier than a normal radio thanks to the extra hardware." + description_info = "This radio can broadcast over any headset frequency that the user has access to. It has a shortwave fallback to directly broadcast to all radio equipment on the same Z-Level/Map in the event of a telecommunications failure. This device requires a functioning Telecommunications Network/Relay to send and receive signals meant for headsets. Additionally, the volume knob seems to be stuck on the max setting. You could hear this thing clear across a room... Not good for discretely listening in on secure channels or being stealthy!" + icon_state = "radio" + name = "subspace radio" + subspace_transmission = 1 + throwforce = 5 + throw_range = 7 + throw_speed = 1 + +//* Bluespace Radio *// +/obj/item/device/bluespaceradio/southerncross_prelinked + name = "bluespace radio (southerncross)" + handset = /obj/item/device/radio/bluespacehandset/linked/southerncross_prelinked + +/obj/item/device/radio/bluespacehandset/linked/southerncross_prelinked + bs_tx_preload_id = "Receiver A" //Transmit to a receiver + bs_rx_preload_id = "Broadcaster A" //Recveive from a transmitter + +#undef CANBROADCAST_INNERBOX \ No newline at end of file diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index aa96b141a1..2f4f1f925e 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -100,6 +100,9 @@ /turf/simulated/wall/sifwood/Initialize(mapload) . = ..(mapload, MAT_SIFWOOD) + +/turf/simulated/wall/rsifwood/Initialize(mapload) + . = ..(mapload, MAT_SIFWOOD, MAT_SIFWOOD, MAT_SIFWOOD) /turf/simulated/wall/log/Initialize(mapload) . = ..(mapload, MAT_LOG) diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm index b4bb8a5c04..40ef6eeb50 100644 --- a/code/game/turfs/simulated/wall_types_vr.dm +++ b/code/game/turfs/simulated/wall_types_vr.dm @@ -186,6 +186,10 @@ var/list/flesh_overlay_cache = list() /turf/simulated/wall/sifwood icon_state = "sifwood" icon = 'icons/turf/wall_masks_vr.dmi' + +/turf/simulated/wall/rsifwood + icon_state = "sifwood" + icon = 'icons/turf/wall_masks_vr.dmi' /turf/simulated/wall/silver icon_state = "silver" diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index a0a43254d7..bd92b1bee9 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -7171,6 +7171,10 @@ /turf/space, /turf/simulated/floor/plating, /area/hangar/two) +"aKG" = ( +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/hangar/two) "aKH" = ( /obj/structure/sign/directions/engineering{ dir = 1; @@ -9720,6 +9724,9 @@ /obj/item/stack/material/silver{ amount = 6 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "bfF" = ( @@ -9749,6 +9756,9 @@ desc = "A large cabinet with hard copy medical records."; name = "Medical Records" }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "bhj" = ( @@ -10352,9 +10362,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "bLW" = ( @@ -15750,6 +15757,9 @@ /obj/item/weapon/module/power_control, /obj/item/weapon/airlock_electronics, /obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/storage/tech) "fUB" = ( @@ -21307,6 +21317,9 @@ /obj/item/device/aicard, /obj/item/weapon/aiModule/reset, /obj/structure/table/steel, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/storage/tech) "nlX" = ( @@ -21410,6 +21423,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/elevator) +"nwe" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/light/floortube{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "nwj" = ( /obj/item/stack/tile/wood, /obj/machinery/alarm{ @@ -21698,6 +21723,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "nZo" = ( @@ -22650,6 +22678,14 @@ }, /turf/simulated/floor/tiled, /area/tcomm/computer) +"pmB" = ( +/obj/machinery/deployable/barrier, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/security/checkpoint3) "pmG" = ( /obj/structure/cable/green{ d1 = 1; @@ -25146,6 +25182,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/storage) "syH" = ( @@ -25714,6 +25753,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) +"tgg" = ( +/obj/structure/lattice, +/obj/item/stack/rods, +/obj/structure/grille/broken, +/turf/space, +/area/space) "tgD" = ( /obj/machinery/light{ dir = 1 @@ -48969,7 +49014,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -48989,8 +49034,8 @@ kwt aaf aaa aaa -aaa -aaa +aVS +xrX aaa aaa aaa @@ -49227,7 +49272,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -49248,9 +49293,9 @@ kwt aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaa aaa xrX @@ -49485,7 +49530,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -49508,7 +49553,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -51803,10 +51848,10 @@ aaf aaf vYi vYi -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf kwt abg aaC @@ -52061,8 +52106,8 @@ aaa aaa aaf aaa -aaa -aaa +aaf +sFQ aaa aaa kwt @@ -52865,7 +52910,7 @@ aEN awI tcO nTw -aEN +nwe awI ati nTw @@ -59779,8 +59824,8 @@ aaa aaa aaa aaa -aaa -aaa +aVS +aaf tOo tOo tOo @@ -64748,7 +64793,7 @@ dXx dYW ftR gYy -kLb +pmB qJp aNX aTA @@ -64939,8 +64984,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf aap aap abz @@ -65971,9 +66016,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf acH aap aap @@ -67003,8 +67048,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf abT abT abT @@ -71450,7 +71495,7 @@ jUC xhd xhd jUC -jUC +aKG dWL aaf aaf @@ -77373,7 +77418,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -77625,13 +77670,13 @@ xSg qSb moQ moQ +aaf aaa aaa aaa aaa aaa -aaa -aaa +aaf aaa aaa aaa @@ -77883,13 +77928,13 @@ moQ moQ moQ aaf +aaf aaa aaa aaa aaa aaa -aaa -aaa +aaf aaa aaa aaa @@ -78147,7 +78192,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -78405,7 +78450,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -78663,7 +78708,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -78921,7 +78966,7 @@ aaa aaa aaa aaa -aaa +vYi aaa aaa aaa @@ -79179,7 +79224,7 @@ aaa aaa aaa aaa -aaa +vYi aaa aaa aaa @@ -79435,9 +79480,9 @@ itV itV itV itV -aaa -aaa -aaa +aaf +aaf +xrX aaa ean aaa @@ -79695,7 +79740,7 @@ xdz itV aaa aaa -aaa +vYi aaa aaa aaa @@ -79953,7 +79998,7 @@ jPJ itV aaa aaa -aaa +vYi aaa aaa aaa @@ -80211,7 +80256,7 @@ jPJ itV aaa aaa -aaa +vYi aaa aaa aaa @@ -80467,9 +80512,9 @@ okX okX okX itV -aaa -aaa -aaa +aaf +aaf +vYi aaa aaa aaa @@ -80727,7 +80772,7 @@ jPJ itV aaa aaa -aaa +vYi aaa aaa aaa @@ -80985,7 +81030,7 @@ jPJ itV aaa aaa -aaa +aVS aaa aaa aaa @@ -81243,7 +81288,7 @@ ust itV aaa aaa -aaa +xrX aaa aaa aaa @@ -81499,8 +81544,8 @@ itV itV itV itV -aaa -aaa +aaf +aaf aaa aaa aaa @@ -82016,8 +82061,8 @@ lse jVV aaa aaa -vYi aaa +vYi aaa aaa aaa @@ -82274,8 +82319,8 @@ lsJ aaa aaa aaa -vYi aaa +vYi aaa ean aaa @@ -82532,6 +82577,7 @@ itV aaf aaf aaf +aaf vYi aaa aaa @@ -82658,7 +82704,6 @@ aaa aaa aaa aaa -aaa "} (205,1,1) = {" aaa @@ -82772,7 +82817,7 @@ vYi aaa aaa aaa -aaa +aaf itV oxn itV @@ -82790,8 +82835,8 @@ aaa aaa aaa aaa -vYi aaa +vYi aaa aaa aaa @@ -83030,7 +83075,7 @@ vYi vYi aaa aaa -aaa +aaf aaa oxq itV @@ -83043,6 +83088,7 @@ jPJ pXB itV aaa +aaf aaa aaa aaa @@ -83174,7 +83220,6 @@ aaa aaa aaa aaa -aaa "} (207,1,1) = {" aaa @@ -83288,7 +83333,7 @@ aaa vYi aaa aaa -aaa +aaf aaa oxL itV @@ -83301,6 +83346,7 @@ jSg sLG itV aaa +aaf aaa aaa aaa @@ -83432,7 +83478,6 @@ aaa aaa aaa aaa -aaa "} (208,1,1) = {" aaa @@ -83546,7 +83591,7 @@ aaa aaa aaa aaa -aaa +aaf aaa oxL itV @@ -83559,7 +83604,7 @@ wZU opg itV aaa -aaa +aaf aaa aaa aaa @@ -83804,7 +83849,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -83816,8 +83861,8 @@ aaa aaa aaa aaa -aaa -aaa +fdW +aaf aaa aaa aaa @@ -84062,7 +84107,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -84075,7 +84120,7 @@ aaa aaa aaa aaa -aaa +sFQ aaa aaa aaa @@ -84320,7 +84365,7 @@ aaa aaa aaa aaa -aaa +xrX aaa aaa aaa @@ -84333,7 +84378,7 @@ aaa aaa aaa aaa -aaa +vYi aaa aaa aaa @@ -84578,8 +84623,8 @@ aaa aaa aaa aaa -aaa -aaa +vYi +vYi aaa aaa vYi @@ -84837,8 +84882,8 @@ aaa aaa aaa aaa -aaa -aaa +vYi +vYi aaa uXr eaV @@ -85096,7 +85141,7 @@ aaa aaa aaa aaa -aaa +tgg aaa uXr uXr diff --git a/maps/southern_cross/southern_cross-10.dmm b/maps/southern_cross/southern_cross-10.dmm index 18d60a035f..fc028dac8f 100644 --- a/maps/southern_cross/southern_cross-10.dmm +++ b/maps/southern_cross/southern_cross-10.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ad" = ( +/obj/machinery/light, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "aj" = ( /obj/effect/zone_divider, /turf/simulated/wall/solidrock, @@ -7,14 +11,31 @@ /obj/effect/zone_divider, /turf/simulated/mineral/sif, /area/surface/outside/wilderness/mountains) +"bc" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "bw" = ( -/obj/structure/railing, +/obj/structure/railing/grey, /turf/simulated/floor/outdoors/grass/sif/planetuse, -/area/surface/outside/wilderness/normal) +/area/surface/outpost/shelter/exterior) "cs" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/wilderness/deep) +"dh" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "wilderness_shelter_1st_floor"; + name = "Wilderness Shelter Shutters"; + pixel_y = -26; + req_one_access = list(1,5,10,12,31,47,48,50) + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "dl" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, @@ -36,8 +57,50 @@ pixel_y = -26; tag_door = "mining_dock_3_door" }, -/turf/simulated/floor/plating/external, +/obj/structure/cable{ + d1 = 16; + d2 = 0; + icon_state = "16-0" + }, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) +"eI" = ( +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) +"eP" = ( +/obj/structure/closet/secure_closet/medical_wall{ + name = "Wilderness Shelter defibrillator closet"; + pixel_y = 31; + req_access = null; + req_one_access = list(1,3,43,66,67); + starts_with = list(/obj/item/device/defib_kit/loaded) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) +"fW" = ( +/obj/machinery/power/rtg/advanced, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "gm" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, @@ -50,6 +113,10 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/surface/outside/wilderness/deep) +"hM" = ( +/obj/random/junk, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "hW" = ( /turf/simulated/floor/outdoors/dirt, /area/surface/outside/path/wilderness) @@ -59,6 +126,14 @@ "iJ" = ( /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/path/wilderness) +"jb" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter) "ji" = ( /turf/simulated/wall/wood, /area/surface/outside/path/wilderness) @@ -68,6 +143,25 @@ "kj" = ( /turf/simulated/wall/solidrock, /area/surface/outpost/wall/checkpoint) +"kA" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/frame{ + anchored = 1 + }, +/obj/machinery/camera/network/substations{ + c_tag = "WILD - Shelter Utility Room"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "lY" = ( /turf/simulated/floor/wood{ outdoors = 1; @@ -80,23 +174,124 @@ }, /turf/simulated/floor/water, /area/surface/outside/river/svartan) -"mU" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating/external, +"mD" = ( +/obj/machinery/button/remote/blast_door{ + id = "wilderness_shelter_1st_floor"; + name = "Wilderness Shelter Shutters"; + pixel_y = 26 + }, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) +"nu" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "nv" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/water, /area/surface/outside/river/svartan) +"nK" = ( +/obj/machinery/light, +/turf/simulated/floor/outdoors/grass/sif/planetuse, +/area/surface/outpost/shelter/exterior) +"nW" = ( +/obj/machinery/power/thermoregulator/southerncross{ + pixel_x = 1; + pixel_y = 26 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/table/sifwooden_reinforced, +/obj/item/stack/material/log/sif{ + amount = 25; + icon_state = "sheet-log_3"; + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/stack/material/log/sif{ + amount = 25; + icon_state = "sheet-log_3"; + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/stack/tile/wood/sif{ + amount = 60; + icon_state = "tile-sifwood_3" + }, +/obj/item/stack/material/wood/sif{ + amount = 50; + icon_state = "sheet-wood_3"; + pixel_y = 2 + }, +/obj/item/weapon/chainsaw, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) +"nY" = ( +/obj/structure/sign/department/medbay{ + name = "FIRST AID" + }, +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter) +"om" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/survival/north{ + name = "Wilderness Shelter Emergency Food Wall Cabinet"; + starts_with = list(/obj/random/mre = 20,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 20) + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "oO" = ( /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/surface/outside/wilderness/normal) "pj" = ( /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/deep) +"pk" = ( +/obj/structure/closet/medical_wall{ + name = "Wilderness Shelter first-aid closet"; + pixel_y = 31; + starts_with = list(/obj/item/roller,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/firstaid/regular = 2,obj/item/weapon/storage/pill_bottle/spaceacillin) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) +"pl" = ( +/obj/structure/simple_door/sifwood, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "wilderness_shelter_Utility"; + layer = 3; + name = "Wilderness Shelter Shutters" + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "pB" = ( /obj/effect/map_effect/portal/master/side_b/wilderness_to_caves/river{ dir = 1 @@ -116,14 +311,61 @@ }, /turf/simulated/floor/water/deep, /area/surface/outside/river/svartan) +"qb" = ( +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter First Floor Exterior"; + dir = 1 + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) +"qk" = ( +/obj/machinery/camera/network/medbay{ + c_tag = "WILD - Shelter First Aid"; + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/table/rack, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/tool/crowbar, +/obj/item/roller, +/obj/item/roller, +/obj/item/weapon/storage/box/bodybags{ + pixel_x = 8; + pixel_y = -5 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "ro" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/grass/sif/forest/planetuse, /area/surface/outside/wilderness/deep) +"rz" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "wilderness_shelter_Utility"; + name = "Wilderness Shelter Shutters"; + pixel_x = 24; + req_one_access = list(1,5,10,12,31,47,48,50) + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "rN" = ( /obj/structure/stairs/spawner/west, /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/surface/outside/path/wilderness) +"rR" = ( +/obj/structure/curtain/medical{ + name = "medical curtain" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "rW" = ( /obj/effect/map_effect/portal/master/side_b/wilderness_to_caves{ dir = 1 @@ -137,6 +379,41 @@ /obj/effect/map_effect/perma_light/concentrated/incandescent, /turf/simulated/floor/water, /area/surface/outpost/wall/checkpoint) +"tb" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) +"tq" = ( +/turf/simulated/wall/rsifwood, +/area/surface/outpost/shelter/exterior) +"tA" = ( +/obj/structure/ladder/up, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) +"uh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "wilderness_shelter_1st_floor"; + layer = 4; + name = "Wilderness Shelter Shutters" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) +"uO" = ( +/obj/machinery/sleep_console{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "uU" = ( /obj/item/weapon/banner/nt, /turf/simulated/shuttle/floor/voidcraft/external, @@ -171,9 +448,9 @@ "xG" = ( /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/wilderness/deep) -"xO" = ( -/turf/simulated/floor/plating/external, -/area/surface/outpost/shelter) +"xZ" = ( +/turf/simulated/wall/rsifwood, +/area/surface/outside/wilderness/mountains) "yb" = ( /turf/simulated/floor/outdoors/grass/sif/planetuse{ tree_chance = 0 @@ -204,10 +481,30 @@ /area/surface/outside/path/wilderness) "ze" = ( /obj/structure/simple_door/sifwood, -/turf/simulated/floor/plating/external, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "wilderness_shelter_1st_floor"; + layer = 4; + name = "Wilderness Shelter Shutters" + }, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) +"zf" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/frame{ + anchored = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "zi" = ( -/obj/random/junk, /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "mining_dock_1"; @@ -215,8 +512,31 @@ pixel_y = -26; tag_door = "mining_dock_1_door" }, -/turf/simulated/floor/plating/external, +/obj/machinery/alarm/sifwilderness{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/table/sifwooden_reinforced, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) +"Ai" = ( +/obj/item/device/geiger/wall/north, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) +"Am" = ( +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter/utilityroom) "Az" = ( /turf/simulated/floor/outdoors/grass/sif/planetuse{ tree_chance = 0 @@ -255,12 +575,16 @@ temperature = 243.15 }, /area/surface/outside/path/wilderness) -"Dg" = ( -/obj/structure/bed/chair{ - dir = 8 +"CR" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plating/external, -/area/surface/outpost/shelter) +/obj/structure/frame{ + anchored = 1 + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "Dy" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/grass/sif/forest/planetuse, @@ -272,19 +596,66 @@ /obj/effect/zone_divider, /turf/simulated/floor/water, /area/surface/outside/river/svartan) +"Ez" = ( +/obj/structure/cable{ + d1 = 16; + d2 = 0; + icon_state = "16-0" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/button/remote/blast_door{ + id = "wilderness_shelter_Utility"; + name = "Wilderness Shelter Shutters"; + pixel_y = 26 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) +"EC" = ( +/obj/machinery/camera/network/substations{ + c_tag = "WILD - Shelter Utility Exterior"; + dir = 4 + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "Fj" = ( -/obj/structure/table/steel, +/obj/structure/table/sifwooden_reinforced, /obj/machinery/power/apc{ dir = 8; - locked = 0; name = "west bump"; - operating = 0; pixel_x = -24 }, -/obj/structure/cable, -/obj/item/stack/material/phoron, -/turf/simulated/floor/plating/external, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/device/radio/subspace{ + desc = "A heavy duty radio that can pick up all manor of shortwave and subspace frequencies. It's a bit bulkier than a normal radio thanks to the extra hardware. An engraving on the frame reads: IF FOUND, RETURN TO WILDERNESS SHELTER!"; + name = "Wilderness Shelter subspace radio" + }, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) +"GE" = ( +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/outdoors/grass/sif/planetuse, +/area/surface/outpost/shelter/exterior) "GK" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, @@ -293,6 +664,12 @@ "GL" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/surface/outpost/wall/checkpoint) +"GZ" = ( +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Hf" = ( /obj/structure/showcase/sign{ desc = "This appears to be a sign warning people that the other side is extremely hazardous."; @@ -308,27 +685,55 @@ "Hx" = ( /turf/simulated/mineral/sif, /area/surface/outside/wilderness/deep) +"HM" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/vending/wallmed1{ + name = "Emergency NanoMed"; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "IJ" = ( /turf/simulated/floor/outdoors/rocks/sif/planetuse, /area/surface/outside/wilderness/deep) +"IK" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) +"IS" = ( +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter First Floor"; + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "IZ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/power/thermoregulator/southerncross{ + dir = 4; + pixel_x = -26; + pixel_y = 2 + }, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/port_gen/pacman, -/turf/simulated/floor/plating/external, +/obj/structure/closet/crate/bin, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) +"Jh" = ( +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "Js" = ( /turf/simulated/floor/water, /area/surface/outside/wilderness/deep) -"Jy" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 26 - }, -/turf/simulated/floor/plating/external, -/area/surface/outpost/shelter) "JH" = ( /turf/simulated/floor/water, /area/surface/outside/ocean) @@ -339,9 +744,7 @@ /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/normal) "KG" = ( -/obj/structure/closet, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating/external, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "Mm" = ( /turf/unsimulated/wall/planetary/sif, @@ -381,6 +784,14 @@ "Rm" = ( /turf/simulated/floor/water, /area/surface/outpost/wall/checkpoint) +"RJ" = ( +/obj/structure/curtain/medical{ + name = "medical curtain" + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/shelter) "Si" = ( /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/wilderness/normal) @@ -396,17 +807,27 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/wilderness/normal) +"Tn" = ( +/obj/machinery/light/small, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "Tr" = ( -/obj/machinery/space_heater, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "mining_dock_2"; - name = "shuttle bay controller"; - pixel_y = -26; - tag_door = "mining_dock_2_door" - }, -/turf/simulated/floor/plating/external, -/area/surface/outpost/shelter) +/obj/structure/table/rack, +/obj/item/weapon/circuitboard/machine/rtg/advanced, +/obj/item/weapon/circuitboard/machine/rtg/advanced, +/obj/item/weapon/circuitboard/machine/rtg/advanced, +/obj/item/stack/cable_coil, +/obj/item/weapon/storage/belt/utility/full, +/obj/random/powercell, +/obj/random/powercell, +/obj/random/powercell, +/obj/fiftyspawner/rods, +/obj/fiftyspawner/rods, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) +"Tw" = ( +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "Tx" = ( /turf/simulated/floor/water, /area/surface/outside/river/svartan) @@ -423,11 +844,23 @@ /turf/simulated/floor/outdoors/grass/sif/planetuse, /area/surface/outside/wilderness/normal) "UR" = ( -/obj/structure/closet/crate, -/obj/random/powercell, -/obj/item/weapon/tool/screwdriver, -/turf/simulated/floor/plating/external, -/area/surface/outpost/shelter) +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/item/stack/material/phoron{ + amount = 2 + }, +/turf/simulated/floor/plating, +/area/surface/outpost/shelter/utilityroom) "Vt" = ( /obj/item/weapon/banner/virgov, /turf/simulated/shuttle/floor/voidcraft/external, @@ -437,8 +870,9 @@ /turf/simulated/floor/water/deep, /area/surface/outside/ocean) "VE" = ( -/obj/machinery/space_heater, -/turf/simulated/floor/plating/external, +/obj/structure/table/sifwooden_reinforced, +/obj/machinery/photocopier/faxmachine, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "VH" = ( /obj/effect/shuttle_landmark{ @@ -460,6 +894,11 @@ /obj/effect/zone_divider, /turf/unsimulated/wall/planetary/sif, /area/surface/outside/ocean) +"XH" = ( +/obj/structure/ladder/up, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Yg" = ( /obj/structure/railing, /turf/simulated/floor/water, @@ -474,10 +913,28 @@ }, /turf/simulated/floor/water, /area/surface/outside/ocean) +"Zr" = ( +/turf/simulated/floor/outdoors/grass/sif/planetuse, +/area/surface/outpost/shelter/exterior) "Zw" = ( -/obj/structure/table/steel, +/obj/structure/table/sifwooden_reinforced, /obj/machinery/cell_charger, -/turf/simulated/floor/plating/external, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -4 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) +"ZZ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) (1,1,1) = {" @@ -19563,7 +20020,7 @@ Sr Sr Si Si -Si +oO Si Si Si @@ -20080,8 +20537,8 @@ Si Si Si Si -Si -Si +oO +oO Si Si Oa @@ -20333,16 +20790,16 @@ Sr Sr Sr Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Si -Oa +Tw +Zr +Zr +Zr +Zr +Zr +Zr +Zr +Tw +tA Oa yC "} @@ -20591,16 +21048,16 @@ yb yb Si Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Si -Oa +ad +tq +Zr +Zr +Zr +tq +Zr +Tw +Tn +tq Oa yC "} @@ -20849,16 +21306,16 @@ yb yb Sr Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Si -Oa +Tw +Zr +Zr +Zr +Zr +Zr +Zr +Tw +Tw +Zr Oa yC "} @@ -21107,16 +21564,16 @@ Sr Sr Sr Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Si -Oa +Tw +Zr +Zr +Tw +Zr +Zr +Tw +Zr +Tw +Tw Oa yC "} @@ -21365,16 +21822,16 @@ Sr yb yb Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Si -Oa +Tw +Zr +Zr +Zr +Tw +Tw +Zr +Zr +Tw +Zr Oa yC "} @@ -21623,16 +22080,16 @@ Sr yb yb Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Si -Oa +ad +tq +Zr +Tw +Tw +tq +Zr +Tw +Tw +tq Oa yC "} @@ -21881,16 +22338,16 @@ yb yb yb Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Oa -Oa +Tw +Zr +Tw +Zr +Zr +EC +Zr +Zr +Tw +Zr Oa yC "} @@ -22139,16 +22596,16 @@ yb yb yb Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Oa -Oa +Tw +Tw +Tw +Tw +Tw +Tw +Tw +Tw +Tw +Zr Oa yC "} @@ -22397,16 +22854,16 @@ yb yb yb Sr -Sr -Si -Si -Si -Si -Si -Si -Si -Oa -Oa +Tw +Tw +Tw +Tw +Tw +Tw +tb +Tw +rz +Zr Oa yC "} @@ -22655,17 +23112,17 @@ yb yb yb Sr -Sr +ad AQ AQ AQ AQ AQ AQ -Si -Oa -Oa -Oa +pl +Am +Am +Am yC "} (87,1,1) = {" @@ -22913,17 +23370,17 @@ yb yb yb yb -Sr -mU +Tw +uh IZ Fj Zw zi -AQ -Oa -Oa -Oa -Oa +jb +Ez +nu +UR +Am yC "} (88,1,1) = {" @@ -23171,17 +23628,17 @@ yb yb yb Sr -Sr +dh AQ -Jy -Dg -xO +mD +hM +GZ VE AQ -Oa -Oa -Oa -Oa +nW +Jh +fW +Am yC "} (89,1,1) = {" @@ -23429,17 +23886,17 @@ yb yb yb yb -Sr +Tw ze -xO -xO -xO +KG +KG +KG dE AQ -Oa -Oa -Oa -Oa +Ai +Jh +kA +Am yC "} (90,1,1) = {" @@ -23687,17 +24144,17 @@ yb yb yb Sr -Sr +qb AQ -xO -xO -xO -xO +KG +KG +KG +XH AQ -Oa -Oa -Oa -Oa +IK +Jh +zf +Am yC "} (91,1,1) = {" @@ -23945,17 +24402,17 @@ yb yb yb Sr -Sr -mU -xO +Tw +uh +ZZ +IS +KG KG -UR -Tr AQ -Oa -Oa -Oa -Oa +Tr +Jh +CR +Am yC "} (92,1,1) = {" @@ -24203,17 +24660,17 @@ oO yb yb Sr -Sr +ad AQ AQ +nY +rR +RJ AQ -AQ -AQ -AQ -Oa -Oa -Oa -Oa +Am +Am +Am +Am yC "} (93,1,1) = {" @@ -24461,13 +24918,13 @@ yb yb yb Sr -Sr -Si -Si -Si -Si -Si -Si +Tw +Zr +Zr +AQ +HM +bc +AQ Oa Oa Oa @@ -24719,13 +25176,13 @@ Sr yb yb Sr -Sr -Sr -Si -Si -Si -Si -Si +Tw +Tw +Zr +AQ +eP +uO +AQ Oa Oa Oa @@ -24977,13 +25434,13 @@ yb Sr Sr Sr -Sr -Sr -Si -Si -Si -Si -Si +Tw +Tw +Zr +AQ +pk +eI +AQ Oa Oa Oa @@ -25235,13 +25692,13 @@ yb Sr Sr Sr -Sr -Sr -Si -Si -Si -Si -Oa +Tw +Tw +Zr +AQ +om +qk +AQ Oa Oa Oa @@ -25493,13 +25950,13 @@ yb yb Sr Sr -Sr -Si -Si -Si -Si -Si -Oa +Tw +Tw +GE +AQ +AQ +AQ +AQ Oa Oa Oa @@ -25751,13 +26208,13 @@ oO yb yb yb -Sr -Sr -Si -Si -Si -Si -Oa +Tw +Tw +Zr +Zr +Zr +Zr +Zr Oa Oa Oa @@ -26011,11 +26468,11 @@ yb yb Sr Sr -Si -Si -Si -Si -Si +Zr +Zr +Zr +Zr +Zr Oa Oa Oa @@ -26270,10 +26727,10 @@ yb Sr Sr Sr -Si -Si -Si -Si +Zr +Zr +Zr +Zr Oa Oa Oa @@ -26528,10 +26985,10 @@ yb Si Sr Sr -Si -Si -Si -Si +Zr +Zr +Zr +Zr Oa Oa Oa @@ -26786,10 +27243,10 @@ yb Si Sr Sr -Si -Si -Si -Si +Zr +Zr +Zr +Zr Oa Oa Oa @@ -27045,10 +27502,10 @@ Si Sr Sr Sr -Si -Si -Si -Si +Zr +Zr +Zr +Zr Oa Oa Oa @@ -27303,10 +27760,10 @@ Si Sr Sr Sr -Si -Si -Si -Si +Zr +Zr +Zr +Zr Oa Oa Oa @@ -27562,10 +28019,10 @@ Si Si Sr Sr -Si -Si -Si -Oa +Zr +Zr +nK +xZ Oa Oa yC @@ -27821,7 +28278,7 @@ Si Si Sr Sr -Si +Zr bw rN Oa diff --git a/maps/southern_cross/southern_cross-12.dmm b/maps/southern_cross/southern_cross-12.dmm index db423d6e19..1ec9fca61d 100644 --- a/maps/southern_cross/southern_cross-12.dmm +++ b/maps/southern_cross/southern_cross-12.dmm @@ -8,6 +8,24 @@ "aE" = ( /turf/simulated/wall/solidrock, /area/surface/outside/wilderness/skylands) +"aK" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey, +/turf/simulated/floor/plating/external, +/area/surface/outpost/shelter/exterior) +"bf" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating/external, +/area/surface/outpost/shelter/exterior) "bj" = ( /turf/simulated/mineral/sif, /area/surface/outside/wilderness/skylands) @@ -20,6 +38,11 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"bY" = ( +/obj/effect/catwalk_plated, +/obj/machinery/light, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "bZ" = ( /turf/simulated/floor/outdoors/ice, /area/surface/outside/wilderness/skylands) @@ -27,6 +50,52 @@ /obj/structure/flora/ausbushes/pointybush, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"ck" = ( +/obj/machinery/light{ + layer = 3 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) +"cn" = ( +/obj/structure/simple_door/sifwood, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "wilderness_shelter_2nd_floor_door"; + layer = 4; + name = "Wilderness Shelter Shutters" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) +"cv" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating/external, +/area/surface/outpost/shelter/exterior) +"cC" = ( +/obj/machinery/power/thermoregulator/southerncross{ + pixel_x = 1; + pixel_y = 26 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/table/standard, +/obj/fiftyspawner/plastic, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) +"cF" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "dd" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/zone_divider, @@ -65,10 +134,27 @@ /obj/effect/zone_divider, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"em" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter/dorms) "et" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"eP" = ( +/obj/structure/coatrack, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "fa" = ( /obj/structure/flora/grass/both, /turf/simulated/floor/outdoors/snow, @@ -77,6 +163,17 @@ /obj/structure/flora/tree/pine, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"fy" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter Second Floor Exterior 3"; + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "fI" = ( /obj/structure/flora/grass/green, /turf/simulated/mineral/floor{ @@ -106,6 +203,30 @@ /obj/structure/flora/bush, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"hs" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) +"hu" = ( +/obj/structure/table/sifwooden_reinforced, +/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice{ + pixel_y = 6 + }, +/obj/item/device/binoculars{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/device/binoculars{ + pixel_x = 5; + pixel_y = -3 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "hy" = ( /obj/structure/flora/rocks1, /turf/simulated/floor/outdoors/grass, @@ -126,14 +247,34 @@ /obj/structure/flora/smallbould, /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/skylands) +"hR" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "hU" = ( /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"ie" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "ih" = ( /obj/structure/flora/ausbushes, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"in" = ( +/obj/structure/table/standard, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/glass, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "iu" = ( /obj/effect/zone_divider, /turf/simulated/mineral/floor/light{ @@ -144,10 +285,20 @@ /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"jb" = ( +/obj/structure/closet/secure_closet/medical_wall{ + name = "Wilderness Shelter defibrillator closet"; + pixel_y = 31; + req_access = null; + req_one_access = list(1,3,43,66,67); + starts_with = list(/obj/item/device/defib_kit/loaded) + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "jc" = ( /obj/effect/catwalk_plated, /turf/simulated/floor/outdoors/dirt/sif/planetuse, -/area/surface/outside/wilderness/skylands) +/area/surface/outpost/shelter/exterior) "jh" = ( /obj/structure/flora/ausbushes/stalkybush, /obj/structure/flora/ausbushes/sparsegrass, @@ -180,11 +331,57 @@ /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"ka" = ( +/obj/machinery/light/small, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + req_one_access = list(1,3,43,67) + }, +/obj/item/weapon/storage/box/syndie_kit{ + max_storage_space = 20; + name = "box of 7.62mm clips"; + starts_with = list(/obj/item/ammo_magazine/clip/c762 = 10) + }, +/obj/item/weapon/storage/box/syndie_kit{ + max_storage_space = 20; + name = "box of 7.62mm clips"; + starts_with = list(/obj/item/ammo_magazine/clip/c762 = 10) + }, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/obj/item/weapon/gun/projectile/shotgun/pump/rifle{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/rifle{ + pixel_y = 6 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "kc" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"kg" = ( +/obj/structure/table/sifwooden_reinforced, +/obj/item/weapon/deck/cards{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/weapon/deck/cah{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/weapon/deck/holder{ + pixel_x = -9; + pixel_y = 1 + }, +/obj/item/weapon/deck/cah/black{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/surface/outpost/shelter/dorms) "km" = ( /obj/structure/flora/rocks1, /turf/simulated/floor/water/deep, @@ -193,10 +390,47 @@ /obj/structure/flora/rocks2, /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/skylands) +"kB" = ( +/obj/structure/cable{ + d1 = 32; + icon_state = "32-1" + }, +/obj/structure/lattice, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter Second Floor Utilities" + }, +/turf/simulated/open{ + temperature = 243.15 + }, +/area/surface/outpost/shelter/utilityroom) "kG" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"kJ" = ( +/obj/structure/curtain/open/bed, +/turf/simulated/floor/carpet/sblucarpet, +/area/surface/outpost/shelter/dorms) +"kO" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "kZ" = ( /obj/structure/flora/ausbushes/palebush, /turf/simulated/floor/outdoors/grass/heavy, @@ -213,6 +447,18 @@ /obj/structure/flora/log1, /turf/simulated/floor/outdoors/mud, /area/surface/outside/wilderness/skylands) +"lP" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) +"lZ" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "me" = ( /obj/structure/flora/bboulder2, /turf/simulated/floor/water, @@ -239,6 +485,15 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/outdoors/mud, /area/surface/outside/wilderness/skylands) +"mG" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/surface/outpost/shelter/dorms) "mI" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/water, @@ -248,6 +503,9 @@ /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"mP" = ( +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter) "mV" = ( /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/water, @@ -257,6 +515,13 @@ /obj/structure/flora/bboulder2, /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/skylands) +"nj" = ( +/obj/structure/closet/walllocker_double/survival/north{ + name = "Wilderness Shelter Emergency Survival Wall Cabinet"; + starts_with = list(/obj/item/device/gps = 5,/obj/item/weapon/material/knife/tacknife/survival = 5,/obj/random/mre = 5,/obj/item/device/flashlight/color/yellow = 5,/obj/item/device/flashlight/flare = 5,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 5,/obj/item/weapon/whetstone) + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "ns" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/water/deep, @@ -328,6 +593,17 @@ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"ph" = ( +/obj/structure/closet, +/obj/item/weapon/storage/box/lights/bulbs, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/melee/umbrella/random, +/obj/item/weapon/melee/umbrella/random, +/obj/item/weapon/melee/umbrella/random, +/obj/item/weapon/melee/umbrella/random, +/obj/item/weapon/melee/umbrella/random, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "pl" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/dirt, @@ -366,6 +642,13 @@ "qJ" = ( /turf/simulated/mineral/floor/light, /area/surface/outside/wilderness/skylands) +"qK" = ( +/obj/machinery/alarm/sifwilderness{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "ra" = ( /obj/structure/flora/rocks1, /obj/structure/flora/lily1, @@ -411,6 +694,10 @@ /obj/effect/zone_divider, /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/skylands) +"sk" = ( +/obj/structure/coatrack, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "sT" = ( /obj/structure/flora/log1, /obj/structure/flora/ausbushes/brflowers, @@ -428,12 +715,26 @@ /obj/effect/zone_divider, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"ti" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "tj" = ( /obj/structure/flora/ausbushes/reedbush, /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/zone_divider, /turf/simulated/floor/outdoors/mud, /area/surface/outside/wilderness/skylands) +"tm" = ( +/obj/effect/catwalk_plated, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "tp" = ( /obj/structure/flora/rocks1, /obj/structure/flora/ausbushes/sunnybush, @@ -454,6 +755,16 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/skylands) +"tI" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "tJ" = ( /obj/structure/flora/bboulder2, /turf/simulated/floor/water/deep, @@ -483,16 +794,49 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"uq" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/structure/mirror{ + pixel_x = -24 + }, +/turf/simulated/floor/tiled/freezer, +/area/surface/outpost/shelter/dorms) "ux" = ( /obj/effect/landmark/map_data{ height = 2 }, /turf/simulated/wall/solidrock, /area/surface/outside/wilderness/skylands) +"uC" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "wilderness_shelter_2nd_floor"; + name = "Wilderness Shelter Shutters"; + pixel_x = 26; + req_one_access = null + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) +"uJ" = ( +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "uR" = ( /obj/effect/zone_divider, /turf/simulated/mineral/sif, /area/surface/outside/wilderness/skylands) +"uW" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "uX" = ( /obj/structure/flora/log1, /obj/structure/flora/lily3, @@ -515,6 +859,21 @@ /obj/effect/zone_divider, /turf/simulated/floor/water/deep, /area/surface/outside/wilderness/skylands) +"vS" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/soap/nanotrasen, +/obj/item/weapon/soap/nanotrasen, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/freezer, +/area/surface/outpost/shelter/dorms) +"wb" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/green, +/obj/structure/curtain/open/bed, +/turf/simulated/floor/carpet/sblucarpet, +/area/surface/outpost/shelter/dorms) "wx" = ( /obj/structure/flora/log2, /obj/structure/flora/rocks1, @@ -545,6 +904,32 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"xv" = ( +/obj/structure/table/sifwooden_reinforced, +/obj/item/weapon/storage/toolbox/emergency{ + pixel_y = 6 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_y = -1 + }, +/obj/machinery/alarm/sifwilderness{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) +"xy" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "xG" = ( /obj/structure/flora/ausbushes/reedbush, /obj/structure/flora/ausbushes/sparsegrass, @@ -565,14 +950,10 @@ /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) "ye" = ( -/obj/effect/catwalk_plated, -/obj/structure/railing{ - dir = 1 - }, /turf/simulated/open{ temperature = 243.15 }, -/area/surface/outside/wilderness/skylands) +/area/surface/outpost/shelter/exterior) "yf" = ( /obj/effect/zone_divider, /turf/simulated/mineral/floor{ @@ -602,6 +983,15 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"yJ" = ( +/obj/structure/table/sifwooden_reinforced, +/obj/item/device/flashlight/lamp/green, +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter Crew Dorms"; + dir = 4 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/surface/outpost/shelter/dorms) "yK" = ( /obj/structure/flora/rocks1, /obj/structure/flora/bboulder2, @@ -627,11 +1017,47 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"Ae" = ( +/obj/structure/table/sifwooden_reinforced, +/obj/item/weapon/storage/box{ + max_storage_space = 20; + name = "box of 7.62mm practice clips"; + pixel_x = 3; + pixel_y = 3; + starts_with = list(/obj/item/ammo_magazine/clip/c762/practice = 10) + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/weapon/storage/bag/trash{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/item/weapon/storage/bag/trash{ + pixel_x = -9; + pixel_y = -5 + }, +/obj/item/weapon/storage/box{ + max_storage_space = 20; + name = "box of 7.62mm practice clips"; + pixel_x = 3; + pixel_y = -1; + starts_with = list(/obj/item/ammo_magazine/clip/c762/practice = 10) + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Ah" = ( /obj/structure/flora/ausbushes/reedbush, /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"Ai" = ( +/obj/structure/ladder, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Aj" = ( /obj/structure/flora/lily3, /obj/structure/flora/log2, @@ -650,15 +1076,42 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"Bo" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/light{ + layer = 3 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "BC" = ( /obj/structure/flora/lily3, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"BG" = ( +/obj/structure/undies_wardrobe, +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "BM" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"BU" = ( +/obj/effect/catwalk_plated, +/obj/structure/ladder, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) +"BY" = ( +/obj/structure/toilet, +/turf/simulated/floor/tiled/freezer, +/area/surface/outpost/shelter/dorms) "Ci" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/brflowers, @@ -670,6 +1123,13 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/outdoors/mud, /area/surface/outside/wilderness/skylands) +"Ct" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "Cz" = ( /turf/simulated/mineral/floor{ outdoors = 1 @@ -691,6 +1151,17 @@ /obj/effect/zone_divider, /turf/simulated/wall/solidrock, /area/surface/outside/wilderness/skylands) +"CT" = ( +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter/utilityroom) +"CZ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter/utilityroom) "Db" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/genericbush, @@ -701,6 +1172,17 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"DA" = ( +/obj/effect/catwalk_plated, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "wilderness_shelter_2nd_floor_door"; + name = "Wilderness Shelter Shutters"; + pixel_x = -26; + req_one_access = list(1,5,10,12,31,47,48,50) + }, +/turf/simulated/floor/outdoors/dirt/sif/planetuse, +/area/surface/outpost/shelter/exterior) "DD" = ( /turf/simulated/open{ temperature = 243.15 @@ -711,6 +1193,16 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"DM" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "DN" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/mud, @@ -719,6 +1211,10 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"Ec" = ( +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Es" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/outdoors/grass/heavy, @@ -777,6 +1273,14 @@ /obj/structure/flora/smallbould, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"Gg" = ( +/obj/structure/closet/medical_wall{ + name = "Wilderness Shelter first-aid closet"; + pixel_y = 31; + starts_with = list(/obj/item/roller,/obj/item/bodybag/cryobag,/obj/item/weapon/storage/firstaid/regular = 2,obj/item/weapon/storage/pill_bottle/spaceacillin) + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Gp" = ( /obj/structure/flora/tree/dead, /obj/structure/flora/log2, @@ -791,6 +1295,12 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"GN" = ( +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter/dorms) +"GS" = ( +/turf/simulated/wall/rsifwood, +/area/surface/outside/wilderness/skylands) "Hb" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/heavy, @@ -812,6 +1322,11 @@ /obj/structure/flora/bboulder1, /turf/simulated/floor/water, /area/surface/outside/wilderness/skylands) +"HI" = ( +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "HJ" = ( /obj/structure/flora/rocks1, /turf/simulated/floor/outdoors/dirt, @@ -822,6 +1337,18 @@ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"Ii" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "Ip" = ( /obj/structure/flora/smallbould, /turf/simulated/floor/outdoors/dirt, @@ -843,16 +1370,33 @@ /obj/structure/flora/log1, /turf/simulated/floor/outdoors/mud, /area/surface/outside/wilderness/skylands) +"JU" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/thermoregulator/southerncross{ + dir = 4; + pixel_x = -26; + pixel_y = 2 + }, +/obj/structure/closet/crate/bin, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Kf" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) -"Kk" = ( -/obj/effect/catwalk_plated, -/turf/simulated/open{ - temperature = 243.15 +"Kq" = ( +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter Second Floor"; + dir = 8 }, -/area/surface/outside/wilderness/skylands) +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "Kr" = ( /obj/structure/flora/rocks1, /obj/structure/flora/bboulder2, @@ -867,6 +1411,12 @@ /obj/structure/flora/grass/brown, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"KF" = ( +/obj/structure/bed/chair/comfy/blue{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/surface/outpost/shelter/dorms) "KS" = ( /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/water, @@ -894,10 +1444,36 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"LU" = ( +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) +"Mb" = ( +/turf/simulated/floor/tiled/freezer, +/area/surface/outpost/shelter/dorms) "Me" = ( /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"Mr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/washing_machine, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) +"Mw" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/log_sif, +/area/surface/outpost/shelter) "MB" = ( /obj/structure/flora/tree/palm, /obj/effect/overlay/coconut, @@ -918,10 +1494,35 @@ /obj/structure/flora/rocks2, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"MY" = ( +/obj/effect/catwalk_plated, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "MZ" = ( /obj/structure/flora/rocks2, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"Nq" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "wilderness_shelter_2nd_floor"; + layer = 4; + name = "Wilderness Shelter Shutters" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) +"Nu" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating/external, +/area/surface/outpost/shelter/exterior) "NH" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, @@ -932,6 +1533,15 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"Oj" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "Ol" = ( /obj/structure/flora/bush, /turf/simulated/floor/outdoors/snow, @@ -961,6 +1571,19 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"OQ" = ( +/obj/effect/catwalk_plated, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "OW" = ( /obj/structure/flora/tree/jungle_small, /obj/structure/flora/ausbushes/sparsegrass, @@ -1000,11 +1623,30 @@ /obj/structure/flora/tree/jungle, /turf/simulated/floor/outdoors/grass/heavy, /area/surface/outside/wilderness/skylands) +"Rb" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "wilderness_shelter_2nd_floor_door"; + name = "Wilderness Shelter Shutters"; + pixel_x = 26 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "Rh" = ( /turf/simulated/mineral/floor/light{ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"Rl" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/turf/simulated/floor/tiled/freezer, +/area/surface/outpost/shelter/dorms) "Rm" = ( /obj/structure/flora/log1, /turf/simulated/floor/outdoors/dirt, @@ -1016,6 +1658,23 @@ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"Ru" = ( +/obj/structure/simple_door/sifwood, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) +"RF" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "RG" = ( /obj/structure/flora/grass/brown, /turf/simulated/mineral/floor/light{ @@ -1027,6 +1686,16 @@ /obj/structure/flora/bboulder1, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"RO" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "RW" = ( /obj/structure/flora/log2, /obj/structure/flora/grass/green, @@ -1046,6 +1715,32 @@ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"Sd" = ( +/obj/structure/bed/chair/comfy/blue, +/turf/simulated/floor/carpet/turcarpet, +/area/surface/outpost/shelter/dorms) +"Se" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/thermoregulator/southerncross{ + dir = 8; + pixel_x = 26; + pixel_y = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "So" = ( /obj/structure/flora/tree/bigtree, /obj/structure/flora/ausbushes/grassybush, @@ -1062,6 +1757,14 @@ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"ST" = ( +/obj/effect/catwalk_plated, +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter Second Floor Exterior 1"; + dir = 4 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) "Te" = ( /obj/structure/flora/log1, /turf/simulated/mineral/floor{ @@ -1082,6 +1785,13 @@ /obj/structure/flora/ausbushes/stalkybush, /turf/simulated/floor/outdoors/grass, /area/surface/outside/wilderness/skylands) +"TC" = ( +/obj/structure/closet/hydrant{ + pixel_y = -26 + }, +/obj/structure/table/standard, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "TD" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/stalkybush, @@ -1138,6 +1848,12 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"VD" = ( +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "VE" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/grass/heavy, @@ -1153,12 +1869,27 @@ /obj/effect/zone_divider, /turf/simulated/mineral, /area/surface/outside/wilderness/skylands) +"Wi" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "Wn" = ( /obj/structure/flora/rocks2, /obj/structure/flora/grass/green, /obj/effect/zone_divider, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"Wv" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "WB" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/rocks, @@ -1168,6 +1899,52 @@ /obj/effect/zone_divider, /turf/simulated/floor/outdoors/dirt, /area/surface/outside/wilderness/skylands) +"WH" = ( +/obj/structure/table/sifwooden_reinforced, +/obj/machinery/cell_charger, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -4 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -5 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -5 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -5 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -5 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) "WI" = ( /obj/structure/flora/rocks1, /obj/structure/flora/ausbushes/ppflowers, @@ -1221,22 +1998,68 @@ /obj/structure/flora/tree/winter, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"XJ" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/yellowdouble, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) "XK" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/effect/zone_divider, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"XU" = ( +/obj/effect/catwalk_plated, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/camera/network/exploration{ + c_tag = "WILD - Shelter Second Floor Exterior 2"; + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/exterior) +"XX" = ( +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "Yb" = ( /obj/structure/flora/ausbushes/palebush, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"Ym" = ( +/obj/machinery/light{ + layer = 3 + }, +/obj/machinery/autolathe, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "Ys" = ( /obj/structure/flora/ausbushes, /turf/simulated/mineral/floor{ outdoors = 1 }, /area/surface/outside/wilderness/skylands) +"Yu" = ( +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/dorms) +"Yv" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/table/standard, +/obj/structure/bedsheetbin{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -5; + pixel_y = 2 + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter/utilityroom) "YA" = ( /obj/structure/flora/tree/winter1, /turf/simulated/floor/outdoors/snow, @@ -1249,6 +2072,14 @@ /obj/structure/flora/rocks2, /turf/simulated/floor/outdoors/snow, /area/surface/outside/wilderness/skylands) +"Zr" = ( +/obj/machinery/bluespace_beacon{ + alpha = 0; + desc = "A device that draws power from bluespace and creates a permanent tracking beacon. This one has a cloaking field. How keen of you to notice!"; + name = "Wilderness Shelter Bluespace Gigabeacon" + }, +/turf/simulated/floor/wood/sif, +/area/surface/outpost/shelter) (1,1,1) = {" aE @@ -20853,8 +21684,8 @@ WO WO WO WO -WO -WO +hR +uW bj aE "} @@ -21103,16 +21934,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +DM +uW +uW +uW +uW +RF +fy +uW +OQ +BU bj aE "} @@ -21361,16 +22192,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +GN +GN +GN +GN +GN +GN +em +GN bj aE "} @@ -21619,16 +22450,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +BY +uq +vS +GN +Wi +eP +Oj +GN bj aE "} @@ -21877,16 +22708,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +Rl +Mb +mG +Yu +LU +Wv +LU +GN bj aE "} @@ -22135,16 +22966,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +GN +GN +GN +GN +LU +Wv +LU +GN bj aE "} @@ -22393,16 +23224,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +Bo +GN +BG +LU +Sd +yJ +KF +Wv +ck +GN bj aE "} @@ -22651,16 +23482,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +sk +LU +Sd +kg +KF +Wv +LU +GN bj aE "} @@ -22909,16 +23740,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +kJ +kJ +LU +HI +LU +Wv +LU +GN bj aE "} @@ -23167,16 +23998,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +ti +GN +XJ +wb +qK +lP +Ii +Se +LU +GN bj aE "} @@ -23425,17 +24256,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +XU +mP +mP +mP +mP +mP +mP +CZ +Ru +CT +CT aE "} (87,1,1) = {" @@ -23683,17 +24514,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +ti +Nq +JU +Ae +WH +xv +Mw +kB +hs +ie +CT aE "} (88,1,1) = {" @@ -23941,17 +24772,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +ti +mP +jb +uJ +VD +hu +mP +Mr +lZ +in +CT aE "} (89,1,1) = {" @@ -24199,17 +25030,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +Bo +mP +nj +Zr +uJ +ka +mP +Yv +XX +Ym +CT aE "} (90,1,1) = {" @@ -24457,17 +25288,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +ti +mP +Gg +uJ +uJ +Ai +mP +cC +XX +TC +CT aE "} (91,1,1) = {" @@ -24715,17 +25546,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +ti +Nq +uC +Kq +uJ +uJ +Ec +Rb +XX +ph +CT aE "} (92,1,1) = {" @@ -24973,17 +25804,17 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -bj +ti +mP +mP +mP +mP +mP +mP +CT +cn +CT +CT aE "} (93,1,1) = {" @@ -25231,16 +26062,16 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO +tI +cF +cF +MY +MY +tm +ST +DA +jc +jc bj aE "} @@ -25492,13 +26323,13 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO +xy +MY +MY +MY +jc +jc +jc bj aE "} @@ -25750,13 +26581,13 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO +xy +MY +MY +MY +jc +jc +jc bj aE "} @@ -26008,13 +26839,13 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO +xy +MY +MY +MY +jc +jc +jc bj aE "} @@ -26266,13 +27097,13 @@ WO WO WO WO -WO -WO -WO -WO -WO -WO -WO +RO +Ct +Ct +Ct +jc +jc +jc bj aE "} @@ -26528,9 +27359,9 @@ WO WO WO WO -WO -WO -WO +kO +jc +jc bj aE "} @@ -26786,9 +27617,9 @@ WO WO WO WO -WO -WO -WO +kO +jc +jc bj aE "} @@ -27044,9 +27875,9 @@ WO WO WO WO -WO -WO -bj +kO +bY +GS bj aE "} @@ -27302,8 +28133,8 @@ WO WO WO WO -WO -WO +kO +jc bj bj aE @@ -27560,8 +28391,8 @@ WO WO WO WO -WO -WO +kO +jc bj bj aE @@ -27818,8 +28649,8 @@ WO WO WO WO -WO -WO +Nu +jc bj bj aE @@ -28076,8 +28907,8 @@ WO WO WO WO -ye -Kk +Nu +jc bj bj aE @@ -28334,7 +29165,7 @@ WO WO WO WO -ye +Nu jc bj bj @@ -28592,8 +29423,8 @@ WO WO WO WO +aK ye -DD bj bj aE @@ -28850,8 +29681,8 @@ WO WO WO WO +aK ye -DD bj bj aE @@ -29108,8 +29939,8 @@ WO WO WO WO -ye -Kk +cv +bf bj bj aE diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index b786783220..c21a6b76e3 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -2152,24 +2152,29 @@ dir = 9 }, /obj/structure/cable/orange{ + d1 = 4; d2 = 10; - icon_state = "0-10" + icon_state = "4-10" }, /turf/simulated/floor/tiled/dark, /area/engineering/hallway/atmos_hallway) "afJ" = ( -/obj/machinery/hologram/holopad, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline/grey, /obj/structure/disposalpipe/segment, +/obj/structure/cable/orange{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/tiled/dark, /area/engineering/hallway/atmos_hallway) "afK" = ( -/turf/simulated/floor/tiled, +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, /area/engineering/hallway/atmos_hallway) "afL" = ( /obj/effect/floor_decal/industrial/warning{ @@ -2412,6 +2417,9 @@ /area/engineering/foyer) "agv" = ( /obj/structure/undies_wardrobe, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/freezer, /area/security/security_restroom) "agw" = ( @@ -6546,6 +6554,9 @@ /obj/machinery/atmospherics/valve/digital{ name = "secondary TEG valve" }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "atI" = ( @@ -7083,6 +7094,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 4 }, +/obj/structure/cable/orange{ + d2 = 10; + icon_state = "0-10" + }, /turf/simulated/floor/tiled/dark, /area/engineering/hallway/atmos_hallway) "avA" = ( @@ -7669,6 +7684,11 @@ d2 = 5; icon_state = "2-5" }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/engineering/hallway/atmos_hallway) "axC" = ( @@ -8177,9 +8197,6 @@ dir = 4 }, /obj/machinery/light/small{ - brightness_color = "#DA0205"; - brightness_power = 1; - brightness_range = 5; dir = 8 }, /turf/simulated/floor/tiled/freezer, @@ -8303,6 +8320,9 @@ /obj/effect/floor_decal/corner/red/bordercorner{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) "azD" = ( @@ -8711,6 +8731,9 @@ pixel_y = -6; req_access = list(10) }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor, /area/engineering/engine_room) "aAK" = ( @@ -16093,6 +16116,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, /turf/simulated/floor, /area/engineering/engine_room) "aYD" = ( @@ -16102,7 +16129,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/computer/security/engineering{ +/obj/item/modular_computer/console/preset/engineering{ dir = 4 }, /turf/simulated/floor/tiled, @@ -17350,10 +17377,10 @@ /turf/simulated/floor, /area/engineering/engine_room) "bcv" = ( -/obj/item/modular_computer/console/preset/engineering{ +/obj/item/device/geiger/wall/south, +/obj/machinery/computer/security/engineering{ dir = 4 }, -/obj/item/device/geiger/wall/south, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "bcw" = ( @@ -19065,6 +19092,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/main) "biE" = ( @@ -23782,10 +23812,6 @@ name = "Kitchen Delivery"; req_access = list(28) }, -/obj/machinery/alarm/freezer{ - dir = 8; - pixel_x = 22 - }, /turf/simulated/floor/tiled, /area/crew_quarters/kitchen) "bwI" = ( @@ -27030,6 +27056,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/security/security_hallway) "bFP" = ( @@ -29940,9 +29969,6 @@ id_tag = "co2_sensor" }, /obj/machinery/light/small{ - brightness_color = "#DA0205"; - brightness_power = 1; - brightness_range = 5; dir = 8 }, /turf/simulated/floor/reinforced/carbon_dioxide, @@ -35309,7 +35335,15 @@ /area/crew_quarters/cafeteria) "chX" = ( /obj/structure/table/woodentable, -/obj/item/weapon/deck/cards, +/obj/item/device/radio/subspace{ + desc = "A heavy duty radio that can pick up all manor of shortwave and subspace frequencies. It's a bit bulkier than a normal radio thanks to the extra hardware. An engraving on the frame reads: IF FOUND, RETURN TO THE BAR!"; + name = "Bar subspace radio"; + pixel_y = 5 + }, +/obj/item/weapon/deck/cards{ + pixel_x = -5; + pixel_y = -2 + }, /turf/simulated/floor/wood, /area/crew_quarters/cafeteria) "chY" = ( @@ -36938,6 +36972,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar) +"cnd" = ( +/obj/item/stack/rods, +/obj/structure/lattice, +/turf/space, +/area/space) "cnf" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, @@ -39323,6 +39362,7 @@ /turf/simulated/floor/airless, /area/rnd/toxins_launch) "cvM" = ( +/obj/machinery/shield_diffuser, /turf/simulated/floor/airless, /area/rnd/toxins_launch) "cvN" = ( @@ -41906,6 +41946,9 @@ /obj/structure/sign/warning/airlock{ pixel_y = 32 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/toxins_launch) "cDu" = ( @@ -45208,8 +45251,7 @@ /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/air_sensor{ frequency = 1445; - id_tag = "engine_exhaust_sensor"; - output = 2 + id_tag = "engine_exhaust_sensor" }, /turf/simulated/floor/airless, /area/engineering/engine_waste) @@ -48379,7 +48421,8 @@ output_level = 750000 }, /obj/structure/cable/orange{ - dir = 8 + d2 = 4; + icon_state = "0-4" }, /turf/simulated/floor/tiled/dark, /area/engineering/hallway/engineer_hallway) @@ -51837,6 +51880,9 @@ /obj/machinery/ai_status_display{ pixel_x = -32 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/medical_lockerroom) "hCW" = ( @@ -60892,6 +60938,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D3) "mEp" = ( @@ -61784,6 +61833,9 @@ pixel_y = 4 }, /obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/chapel/main) "ngb" = ( @@ -65178,13 +65230,10 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D3) "peA" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/shield_diffuser, -/turf/simulated/floor/airless, +/obj/item/stack/rods, +/obj/structure/lattice, +/obj/structure/grille/broken, +/turf/space, /area/space) "peJ" = ( /turf/simulated/floor/wood, @@ -66485,6 +66534,21 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/dockhallway) +"pOA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 4 + }, +/obj/structure/cable/orange{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 5; + icon_state = "2-5" + }, +/turf/simulated/floor/tiled/dark, +/area/engineering/hallway/atmos_hallway) "pOD" = ( /obj/machinery/smartfridge/secure/virology, /obj/effect/floor_decal/borderfloorwhite{ @@ -68835,6 +68899,7 @@ /area/hallway/primary/seconddeck/fscenter) "rnx" = ( /obj/structure/flora/ausbushes/stalkybush, +/obj/machinery/light, /turf/simulated/floor/grass, /area/hallway/primary/seconddeck/fscenter) "roo" = ( @@ -70918,10 +70983,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/sensor{ - name = "Powernet Sensor - Engine Power"; - name_tag = "Engine Power" - }, /obj/machinery/atmospherics/binary/pump{ dir = 1 }, @@ -73209,6 +73270,14 @@ /obj/machinery/lapvend, /turf/simulated/floor/tiled/yellow, /area/crew_quarters/coffee_shop) +"tXq" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 1; + start_pressure = 4559.63 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/security_starboard) "tXV" = ( /obj/structure/cable{ d1 = 1; @@ -79296,6 +79365,10 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 4 }, +/obj/machinery/light{ + dir = 4; + layer = 3 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "xEA" = ( @@ -93945,10 +94018,10 @@ wWX aaf aag aag -aaf -aaa -aaa -aaa +wWX +aag +aag +wWX aaa aaa aaa @@ -94206,7 +94279,7 @@ aaa aaa aaa aaa -aaa +aag aaa aaa aaa @@ -94464,7 +94537,7 @@ aaa aaa aaa aaa -aaa +aag aaa aaa aaa @@ -94722,7 +94795,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -94980,7 +95053,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -95496,7 +95569,7 @@ bCE aaa aaa aaa -aaa +wWX aaa aaa aaa @@ -95754,7 +95827,7 @@ bCC aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -101132,7 +101205,7 @@ cxn cyU auK afH -afH +pOA axA ayP ahe @@ -119180,7 +119253,7 @@ bXK asb ccA cdG -cgb +tXq chd cjr cqx @@ -125113,7 +125186,7 @@ aaa aaa aaa aaa -aaa +wWX aaa wxw aaf @@ -125371,7 +125444,7 @@ aaa aaa aaa aaa -aaa +aag aaa aaa aaf @@ -125629,7 +125702,7 @@ aaa aaa aaa aaa -aaa +aag aaa aaa aaa @@ -125887,8 +125960,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf aaa aaa aaf @@ -126146,8 +126219,8 @@ aaa aaa aaa aaa -aaa -aaa +aag +wWX aaa wWX aaa @@ -126405,10 +126478,10 @@ aaa aaa aaa aaa -aaa -aab -aaa -aaa +aaf +cnd +aag +aag ctj cvs cwN @@ -127440,8 +127513,8 @@ aaa aaa aaa aaa -wxw -aaa +aWC +aaf aaf aaa aaa @@ -127956,8 +128029,8 @@ aaa aaa aaa aaa -aaa -aaa +aaf +aaf aaf aaa aaa @@ -130795,7 +130868,7 @@ bvj bvj bvj bvj -peA +bvj cvL cxm cyT @@ -131017,7 +131090,7 @@ aaa aaa aaa aaa -aaa +wWX aaa aaa aaa @@ -131275,10 +131348,10 @@ aaa aaa aaa aaa +aaf aaa aaa -aaa -aaa +aaf aaf aaa aaa @@ -131533,10 +131606,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf +aag +aag +aaf aaa aaa aaa @@ -131793,7 +131866,7 @@ aaa aaa aaa aaa -aaa +aag aaa aaa aaa @@ -131874,7 +131947,7 @@ aag aag aag cuR -aaa +aaf aaa aaa aaa @@ -132051,9 +132124,9 @@ aaa aaa aaa aaa -aaa -aaa -aab +aag +aag +peA aaa aaa aaa @@ -132896,7 +132969,7 @@ opM aaa aaa aaa -aaa +aab aaa aaa aaa @@ -133154,7 +133227,7 @@ opM aaa aaa aaa -aaa +aaf aaa aaa aaa diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index ce6c3aeb18..ded9138fdf 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -1736,6 +1736,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) "bRW" = ( @@ -2321,6 +2322,9 @@ dir = 1 }, /obj/structure/loot_pile/maint/boxfort, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/forestarboard) "cvI" = ( @@ -14202,6 +14206,9 @@ dir = 4 }, /obj/random/trash_pile, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftstarboard) "ogb" = ( @@ -15641,6 +15648,9 @@ "pzk" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/portable_atmospherics/powered/scrubber, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) "pzv" = ( @@ -20475,6 +20485,7 @@ /area/hallway/primary/thirddeck/aft) "uAL" = ( /obj/machinery/vending/wallmed1{ + dir = 1; name = "NanoMed Wall"; pixel_y = -30 }, @@ -20567,7 +20578,6 @@ /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/thirddeck) "uEX" = ( -/obj/structure/curtain/open/shower, /obj/machinery/shower{ dir = 1 }, @@ -38899,7 +38909,7 @@ apc apc apc apc -apc +aqj apc apc jhg @@ -38909,7 +38919,7 @@ jhg jhg apc apc -apc +aqj apc apc apc @@ -48219,7 +48229,7 @@ xes apc apc apc -epg +tHb aqj apc apc @@ -51517,8 +51527,8 @@ apc apc apc apc -jhg -jhg +vvI +vvI jhg jhg jhg @@ -64131,7 +64141,7 @@ xeL epg aqj aqj -apc +aqj jhg jhg jhg @@ -64932,7 +64942,7 @@ jhg apc apc apc -apc +aqj apc apc qjy @@ -67062,7 +67072,7 @@ jhg apc apc apc -apc +tHb apc apc apc @@ -67317,10 +67327,10 @@ jhg jhg jhg jhg -apc -apc -apc -apc +aqj +aqj +aqj +htn apc apc apc @@ -72676,7 +72686,7 @@ jhg jhg jhg jhg -jhg +vvI jhg jhg jhg @@ -73711,7 +73721,7 @@ aqj aqj aqj aqj -apc +aqj jhg jhg jhg @@ -75772,7 +75782,7 @@ jhg jhg jhg jhg -jhg +vvI jhg jhg jhg @@ -76593,7 +76603,7 @@ apc apc aqj apc -apc +aqj apc apc apc @@ -76851,7 +76861,7 @@ epg epg epg htn -apc +aqj apc apc apc diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm index f671ff3b99..70bfc1494d 100644 --- a/maps/southern_cross/southern_cross-5.dmm +++ b/maps/southern_cross/southern_cross-5.dmm @@ -1242,6 +1242,7 @@ d2 = 2; icon_state = "1-2" }, +/mob/living/simple_mob/animal/passive/mouse/mining, /turf/simulated/floor/tiled/steel_dirty, /area/surface/outpost/mining_main/uxstorage) "dH" = ( @@ -1469,55 +1470,6 @@ /turf/simulated/floor/plating, /area/surface/outpost/main/airlock/right_two) "ej" = ( -/obj/machinery/computer/crew, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm{ - frequency = 1441; - pixel_y = 22 - }, -/turf/simulated/floor/tiled/white, -/area/surface/outpost/main/search_and_rescue) -"ek" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+006; - req_access = list(5) - }, -/obj/structure/table/rack, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor/southleft{ - req_access = list(5); - req_one_access = list(5,43) - }, -/turf/simulated/floor/tiled/white, -/area/surface/outpost/main/search_and_rescue) -"el" = ( /obj/machinery/sleep_console{ dir = 4 }, @@ -1527,9 +1479,12 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/surface/outpost/main/search_and_rescue) -"em" = ( +"ek" = ( /obj/machinery/sleeper{ dir = 4 }, @@ -1541,11 +1496,79 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/surface/outpost/main/search_and_rescue) -"en" = ( -/obj/structure/table/glass, +"el" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/roller{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/item/roller{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/roller{ + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/roller{ + pixel_x = -8; + pixel_y = 9 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/main/search_and_rescue) +"em" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/weapon/storage/firstaid/regular{ + pixel_x = -5; + pixel_y = -5 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/main/search_and_rescue) +"en" = ( +/obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -1555,14 +1578,14 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/bodybag, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/weapon/storage/box/bodybags, /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "eo" = ( @@ -2008,45 +2031,42 @@ d2 = 4; icon_state = "0-4" }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/surface/outpost/main/search_and_rescue) "fe" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, /obj/structure/cable/blue{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "ff" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "fg" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "fh" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/bed/chair/office/light{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "fi" = ( @@ -2056,14 +2076,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/obj/machinery/door/window/westleft{ +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor/westleft{ name = "Medical Supplies"; req_access = null; req_one_access = list(5,43) }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "fj" = ( @@ -2157,7 +2177,9 @@ icon_state = "0-8" }, /obj/machinery/shieldwallgen{ - req_access = list(43) + anchored = 1; + req_access = list(1,43); + state = 1 }, /turf/simulated/floor/tiled, /area/surface/outpost/main/exploration/containment) @@ -2498,6 +2520,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "gc" = ( @@ -2518,10 +2546,9 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/table/glass, -/obj/item/clothing/accessory/stethoscope, -/obj/item/device/defib_kit/loaded, -/obj/item/device/defib_kit/compact/loaded, +/obj/machinery/computer/crew{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "gg" = ( @@ -2541,6 +2568,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/item/weapon/reagent_containers/blood/OPlus, /obj/item/weapon/reagent_containers/blood/OPlus, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "gh" = ( @@ -3125,19 +3153,19 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "hn" = ( -/obj/structure/table/glass, /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/weapon/tool/wrench, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/table/glass, +/obj/item/clothing/accessory/stethoscope, +/obj/item/device/defib_kit/loaded, +/obj/item/device/defib_kit/compact/loaded, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "ho" = ( @@ -3190,7 +3218,7 @@ "ht" = ( /obj/structure/closet/secure_closet{ name = "hunting locker"; - req_one_access = list(43) + req_one_access = list(1,43) }, /obj/item/weapon/gun/energy/netgun, /obj/item/weapon/beartrap/hunting, @@ -3495,17 +3523,17 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "ig" = ( -/obj/machinery/door/window/westleft{ - name = "Medical Supplies"; - req_access = null; - req_one_access = list(5,43) - }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, +/obj/machinery/door/window/brigdoor/westleft{ + name = "Medical Supplies"; + req_access = null; + req_one_access = list(5,43) + }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "ih" = ( @@ -3518,12 +3546,6 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "ii" = ( -/obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/adv{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/weapon/storage/firstaid/o2, /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, @@ -3537,6 +3559,29 @@ c_tag = "MO - Search and Rescue Starboard"; dir = 8 }, +/obj/structure/window/reinforced{ + health = 1e+006; + req_access = list(5) + }, +/obj/structure/table/rack, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/item/clothing/glasses/hud/health, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/brigdoor/southleft{ + dir = 8; + name = "EMT Supplies"; + req_access = list(5); + req_one_access = list(5,43) + }, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "ij" = ( @@ -3604,7 +3649,7 @@ "ir" = ( /obj/structure/closet/secure_closet{ name = "hunting locker"; - req_one_access = list(43) + req_one_access = list(1,43) }, /obj/item/weapon/gun/energy/netgun, /obj/item/weapon/beartrap/hunting, @@ -3981,35 +4026,63 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/structure/closet/l3closet/scientist, /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "jb" = ( -/obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/item/roller, -/obj/item/roller{ - pixel_y = 8 - }, -/turf/simulated/floor/tiled/white, -/area/surface/outpost/main/search_and_rescue) -"jc" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/toxin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/weapon/storage/firstaid/o2{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/weapon/storage/firstaid/o2{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = -5; + pixel_y = -5 + }, +/turf/simulated/floor/tiled/white, +/area/surface/outpost/main/search_and_rescue) +"jc" = ( +/obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, +/obj/item/weapon/tool/wrench, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, /turf/simulated/floor/tiled/white, /area/surface/outpost/main/search_and_rescue) "jd" = ( @@ -4833,6 +4906,9 @@ /area/surface/outside/plains/mountains) "kL" = ( /obj/machinery/power/port_gen/pacman, +/obj/machinery/camera/network/engineering_outpost{ + c_tag = "ENG - Mining Outpost Power 2" + }, /turf/simulated/floor/plating, /area/surface/outpost/engineering/atmos_room) "kN" = ( @@ -5209,7 +5285,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/multi_tile/metal{ name = "Fauna Containment"; - req_one_access = list(43,1) + req_one_access = list(1,43) }, /obj/machinery/door/firedoor/multi_tile/glass, /obj/effect/floor_decal/steeldecal/steel_decals_central1{ @@ -5965,6 +6041,9 @@ /area/surface/outpost/main/corridor/right_upper) "mR" = ( /obj/machinery/telecomms/relay/preset/southerncross/wild, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/outpost/main/tcomm) "mS" = ( @@ -7430,6 +7509,7 @@ /obj/item/stack/material/copper{ amount = 25 }, +/obj/machinery/light/small, /turf/simulated/floor/plating, /area/surface/outpost/engineering/atmos_room) "pc" = ( @@ -14563,6 +14643,13 @@ }, /turf/simulated/floor/tiled, /area/surface/outpost/main/airlock/left_one) +"Bu" = ( +/obj/machinery/power/port_gen/pacman, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/surface/outpost/engineering/atmos_room) "Bv" = ( /obj/structure/bed/chair{ dir = 1 @@ -19226,6 +19313,9 @@ /obj/structure/table/steel, /obj/random/junk, /obj/random/maintenance/engineering, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, /area/surface/outpost/main/gen_room) "Ks" = ( @@ -65768,7 +65858,7 @@ gO hM iH bO -kL +Bu lW nE pi @@ -77112,7 +77202,7 @@ Tg Tg Tg Tg -do +dp ej fe gb @@ -77888,7 +77978,7 @@ UX UX dp em -fh +ge ge hm if @@ -78144,7 +78234,7 @@ UX UX UX UX -dp +do en fi gf @@ -78405,7 +78495,7 @@ UX do eo fj -ge +fh ho ih jb diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index df41e87efc..1a83965871 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -91,9 +91,7 @@ /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology) "ag" = ( -/obj/machinery/computer/area_atmos{ - dir = 1 - }, +/obj/machinery/computer/area_atmos, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology/anomaly) "ah" = ( @@ -238,6 +236,8 @@ /obj/machinery/camera/network/research_outpost{ c_tag = "OPR - Xenoarchaeology SMES" }, +/obj/item/weapon/airlock_electronics, +/obj/item/weapon/airlock_electronics, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/smes) "bR" = ( @@ -402,6 +402,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) +"fc" = ( +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/outpost/research/xenoarcheology/exterior) "fn" = ( /turf/simulated/wall/r_wall, /area/surface/outpost/research/xenoarcheology/anomaly) @@ -417,6 +420,12 @@ /obj/effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/anomaly) +"fK" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/outpost/research/xenoarcheology/exterior) "fN" = ( /turf/simulated/wall/r_wall, /area/surface/outpost/research/xenoarcheology/longtermstorage) @@ -459,6 +468,11 @@ }, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/exp_prep) +"gz" = ( +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/surface/outpost/research/xenoarcheology/exterior) "gH" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -526,6 +540,9 @@ "hN" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) "hO" = ( @@ -778,8 +795,18 @@ /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology) "kN" = ( -/turf/simulated/mineral/floor/ignore_mapgen/sif, -/area/surface/outpost/mining_main/cave) +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Outpost Maintenance Hatch"; + normalspeed = 0; + req_one_access = list(1,5,10,12,31,47,48,50) + }, +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/surface/outpost/research/xenoarcheology/exterior) "kO" = ( /obj/machinery/atmospherics/unary/heater{ dir = 1 @@ -1190,6 +1217,10 @@ }, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology) +"op" = ( +/obj/effect/zone_divider, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/outpost/research/xenoarcheology/exterior) "os" = ( /obj/structure/table/steel, /obj/machinery/cell_charger, @@ -1255,6 +1286,19 @@ }, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) +"oZ" = ( +/obj/structure/table/steel, +/obj/item/weapon/storage/box/lights/bulbs{ + pixel_y = 5 + }, +/obj/item/weapon/storage/toolbox/emergency{ + pixel_y = 3; + starts_with = list(/obj/item/weapon/tool/crowbar/red,/obj/item/weapon/extinguisher/mini,/obj/item/device/radio,/obj/item/weapon/light/bulb) + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/surface/outpost/research/xenoarcheology/exterior) "pb" = ( /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) @@ -1412,6 +1456,7 @@ dir = 1; pixel_y = -24 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/exp_prep) "rz" = ( @@ -1464,6 +1509,10 @@ /obj/effect/zone_divider, /turf/simulated/mineral/sif, /area/surface/cave/unexplored/normal) +"rT" = ( +/obj/machinery/light/small, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/outpost/research/xenoarcheology/exterior) "rX" = ( /obj/structure/table/rack{ dir = 8; @@ -2070,6 +2119,9 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/smes) "yP" = ( @@ -2401,6 +2453,20 @@ }, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) +"CS" = ( +/obj/structure/cable/heavyduty{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/surface/outpost/research/xenoarcheology/exterior) "CV" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -2642,6 +2708,14 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/exp_prep) +"FR" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/surface/outpost/research/xenoarcheology/exterior) "FV" = ( /obj/machinery/artifact_scanpad, /turf/simulated/floor/tiled/white, @@ -2733,10 +2807,13 @@ /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) "GX" = ( +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating2" }, -/area/surface/cave/explored/normal) +/area/surface/outpost/research/xenoarcheology/exterior) "GY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/blue{ @@ -3155,6 +3232,9 @@ icon_state = "1-2"; id = "surface_cave" }, +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, /turf/simulated/floor/plating{ icon_state = "asteroidplating2" }, @@ -3608,6 +3688,14 @@ }, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology) +"RK" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/surface/outpost/mining_main/cave) "RV" = ( /obj/effect/map_effect/portal/master/side_b/caves_to_plains{ dir = 1 @@ -3627,7 +3715,7 @@ "Sh" = ( /obj/item/weapon/banner/nt, /turf/simulated/mineral/floor/ignore_mapgen/sif, -/area/surface/cave/explored/normal) +/area/surface/outpost/research/xenoarcheology/exterior) "Sn" = ( /obj/structure/cable/blue{ d1 = 4; @@ -3807,6 +3895,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/light, /turf/simulated/floor/tiled/white, /area/surface/outpost/research/xenoarcheology) "TN" = ( @@ -4017,7 +4106,7 @@ /turf/simulated/floor/plating{ icon_state = "asteroidplating2" }, -/area/surface/cave/explored/normal) +/area/surface/outpost/research/xenoarcheology/exterior) "Yg" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 1 @@ -4090,6 +4179,12 @@ }, /turf/simulated/floor/tiled, /area/surface/outpost/research/xenoarcheology/anomaly) +"YE" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/outpost/research/xenoarcheology/exterior) "YG" = ( /turf/simulated/wall/r_wall, /area/surface/outpost/research/xenoarcheology/medical) @@ -4178,6 +4273,12 @@ icon_state = "asteroidplating2" }, /area/surface/outpost/mining_main/cave) +"Zw" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/outpost/research/xenoarcheology/exterior) "Zy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -30535,22 +30636,22 @@ Hp Hp Hp Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc cv Uz Uz @@ -30792,30 +30893,30 @@ mI mI Hp Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc Yd -Hp -Hp -Hp -Hp -Hp -kN +fc +fc +fc +fc +fc +RK qq Zt uY @@ -31049,31 +31150,31 @@ Hp mI mI mI -mI -mI -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -mI -Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc Yd -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc uY +RK uY Zt uY @@ -31307,31 +31408,31 @@ Hp Hp mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +fc +fc +fc +fK +fc +fc +fc +fc +fc +fc +fc +fK Sh Cg Cg Cg Sh -Hp +fK Yd -Hp -Hp -Hp -Hp -Hp -kN +fc +fc +fc +fc +fc +RK Dj Zt uY @@ -31564,9 +31665,9 @@ Hp Hp Hp mI -mI -mI -mI +fc +fc +fc RW RW RW @@ -31589,7 +31690,7 @@ NW NW NW NW -XI +kN XI Yg XI @@ -31822,8 +31923,8 @@ Hp Hp Hp mI -mI -Hp +fc +fc RW RW Se @@ -31847,7 +31948,7 @@ KX kV NW NW -mI +Yd jP SY ns @@ -32078,10 +32179,10 @@ mI mI Hp Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc cH oe mv @@ -32105,7 +32206,7 @@ NQ NQ dA NW -mI +Yd jP SY ns @@ -32335,11 +32436,11 @@ mI mI mI Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +rT RW rp uo @@ -32363,8 +32464,8 @@ jf Fq mj NW -mI -mI +Yd +oZ mI ns "} @@ -32592,12 +32693,12 @@ mI mI mI Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc RW gc Fi @@ -32621,8 +32722,8 @@ Dv Tf OA NW -mI -mI +CS +gz mI ns "} @@ -32850,12 +32951,12 @@ mI mI Hp Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc RW gm uo @@ -32879,8 +32980,8 @@ MI lf pO NW -mI -mI +FR +gz mI ns "} @@ -33108,12 +33209,12 @@ mI mI sb Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc cH gp iv @@ -33137,8 +33238,8 @@ Kx sK CV NW -mI -mI +fc +fc mI ns "} @@ -33366,9 +33467,9 @@ mI mI Hp Hp -Hp -Hp -Hp +fc +fc +fc bF bF bF @@ -33395,8 +33496,8 @@ eo kx DD NW -mI -mI +fc +fc mI ns "} @@ -33624,9 +33725,9 @@ mI Hp Hp Hp -Hp -Hp -Hp +fc +fc +fc bR bY AC @@ -33653,8 +33754,8 @@ cL cL NW NW -mI -mI +fc +fc mI ns "} @@ -33882,9 +33983,9 @@ Hp Hp Hp Hp -Hp -Hp -Hp +fc +fc +fc bR bR hq @@ -33910,9 +34011,9 @@ WQ lI NA tC -mI -mI -mI +fc +fc +fc mI ns "} @@ -34140,9 +34241,9 @@ mI Hp Hp sb -Hp -Hp -Hp +fc +fc +fc bU bU aa @@ -34168,9 +34269,9 @@ Ic LU pS tC -mI -mI -mI +Zw +fc +fc mI ns "} @@ -34398,9 +34499,9 @@ Hp Hp mI mI -Hp -Hp -Hp +fc +fc +fc bU cf AC @@ -34426,9 +34527,9 @@ Gn hW iD tC -mI -mI -mI +fc +fc +fc mI ns "} @@ -34656,9 +34757,9 @@ Hp mI mI mI -Hp -Hp -Hp +fc +fc +fc bR bY AC @@ -34685,8 +34786,8 @@ cL cL VW VW -mI -mI +fc +fc mI ns "} @@ -34914,9 +35015,9 @@ mI mI mI mI -Hp -Hp -Hp +fc +fc +fc bF bF bF @@ -34943,8 +35044,8 @@ ai LV XL VW -mI -mI +fc +fc mI ns "} @@ -35172,12 +35273,12 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc fE hD iF @@ -35201,8 +35302,8 @@ NY Eu pF Hg -Hp -mI +fc +fc mI ns "} @@ -35430,12 +35531,12 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +rT fn hH iG @@ -35459,8 +35560,8 @@ Od Ir BH VW -Hp -Hp +Zw +fc mI ns "} @@ -35688,12 +35789,12 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc fn hN ja @@ -35717,8 +35818,8 @@ Gg ap sD VW -Hp -Hp +fc +fc mI ns "} @@ -35946,12 +36047,12 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc fE hR jq @@ -35975,8 +36076,8 @@ Hv pU PE Hg -Hp -Hp +fc +fc mI ns "} @@ -36204,12 +36305,12 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc fN hU jF @@ -36233,8 +36334,8 @@ bV oN Gp VW -Hp -Hp +fc +fc mI ns "} @@ -36462,12 +36563,12 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc fN ie jI @@ -36491,8 +36592,8 @@ Ce pU Op VW -Hp -Hp +fc +fc mI ns "} @@ -36721,11 +36822,11 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc fN il jN @@ -36749,8 +36850,8 @@ Kv Jr Jr KF -Hp -Hp +fc +fc mI ns "} @@ -36979,11 +37080,11 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +rT fN it jQ @@ -37007,8 +37108,8 @@ OP sv jE KF -Hp -Hp +Zw +fc mI ns "} @@ -37237,11 +37338,11 @@ rM rM rM rM -BO -BO -BO -BO -BO +op +op +op +op +op fN fN jV @@ -37265,8 +37366,8 @@ Fj Cr KF KF -rM -BO +op +op rM ax "} @@ -37496,11 +37597,11 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc fN fN fN @@ -37522,9 +37623,9 @@ KF KF KF KF -mI -mI -mI +fc +fc +fc mI ns "} @@ -37755,34 +37856,34 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +YE +fc +fc +fc +fc +fc +fc GX +gz +gz +gz GX -GX -GX -GX -Hp -Hp -Hp -Hp -mI -mI -mI -mI -mI -mI -mI +fc +fc +fc +fc +fc +fc +YE +fc +fc +fc +fc mI ns "} @@ -38014,33 +38115,33 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -mI -mI -mI -mI -mI +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc mI ns "} @@ -38273,22 +38374,22 @@ mI mI mI mI -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp -Hp +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc +fc mI mI mI @@ -38537,13 +38638,13 @@ mI mI mI mI -Hp -Hp -Hp +fc +fc +fc mI mI -Hp -Hp +fc +fc mI mI mI @@ -67055,11 +67156,11 @@ iy iy iy iy +bE nu nu nu -nu -nu +bE nu iy iy diff --git a/maps/southern_cross/southern_cross-7.dmm b/maps/southern_cross/southern_cross-7.dmm index 97c3d9c384..f382f2e907 100644 --- a/maps/southern_cross/southern_cross-7.dmm +++ b/maps/southern_cross/southern_cross-7.dmm @@ -7973,6 +7973,9 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/machinery/light/spot{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/expoutpost/hangarone) "vQ" = ( @@ -13554,6 +13557,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/expoutpost/innerportmaint) +"Pl" = ( +/obj/structure/table/sifwoodentable, +/obj/item/device/bluespaceradio/southerncross_prelinked, +/turf/simulated/floor/tiled, +/area/expoutpost/prep) "Pq" = ( /obj/structure/table/glass, /obj/random/soap, @@ -13688,6 +13696,14 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/shuttle3/start) +"PN" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/light/spot{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/expoutpost/hangartwo) "PO" = ( /obj/structure/cable/blue{ d1 = 4; @@ -14351,6 +14367,14 @@ }, /turf/simulated/floor/tiled, /area/expoutpost/shuttle) +"Sz" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/light/spot{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/expoutpost/hangarone) "SC" = ( /obj/structure/table/bench/sifwooden, /turf/simulated/floor/tiled, @@ -35788,7 +35812,7 @@ sI dS of gT -dW +Sz ZV Zn Qh @@ -37336,7 +37360,7 @@ sI dS of gT -dW +Sz ZV Zn Qh @@ -45076,7 +45100,7 @@ oM ex dt aU -tI +PN eI eH ut @@ -45103,7 +45127,7 @@ It KN NT Qt -TR +Pl TR XO Jh @@ -46624,7 +46648,7 @@ sQ te dt aU -tI +PN eI eH ut diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm index b9a81c9bf9..16ea7305ea 100644 --- a/maps/southern_cross/southern_cross_areas.dm +++ b/maps/southern_cross/southern_cross_areas.dm @@ -169,6 +169,23 @@ /area/surface/outpost/shelter name = "Wilderness Shelter" + +/area/surface/outpost/shelter/dorms + name = "Wilderness Shelter Dorms" + icon_state = "Sleep" + soundproofed = TRUE + limit_mob_size = FALSE + flags = RAD_SHIELDED + +/area/surface/outpost/shelter/exterior + name = "Wilderness Shelter Exterior" + icon_state = "exit" + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/music/LRRMenu.ogg', 'sound/music/LRRTrack3.ogg', 'sound/ambience/cave/AmbCaveDebriA.ogg', 'sound/ambience/cave/AmbCaveDebriB.ogg', 'sound/ambience/cave/AmbCaveDebriC.ogg', 'sound/ambience/cave/AmbCaveDebriD.ogg') + outdoors = OUTDOORS_YES + +/area/surface/outpost/shelter/utilityroom + name = "Wilderness Shelter Utility Room" + icon_state = "substation" // Main mining outpost /area/surface/outpost/mining_main @@ -291,6 +308,10 @@ /area/surface/outpost/research/xenoarcheology name = "\improper Xenoarcheology" +/area/surface/outpost/research/xenoarcheology/exterior + name = "\improper xenoarcheology Exterior" + icon_state = "exit" + /area/surface/outpost/research/xenoarcheology/medical name = "Xenoarcheology First-Aid Station" diff --git a/vorestation.dme b/vorestation.dme index cda95b7998..28a8edeade 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -837,6 +837,7 @@ #include "code\game\machinery\adv_med_vr.dm" #include "code\game\machinery\ai_slipper.dm" #include "code\game\machinery\air_alarm.dm" +#include "code\game\machinery\airconditioner_ch.dm" #include "code\game\machinery\airconditioner_vr.dm" #include "code\game\machinery\airconditioner_yw.dm" #include "code\game\machinery\atm_ret_field.dm"