From 588471b8866a570b716285e985afffc812cdcbfb Mon Sep 17 00:00:00 2001 From: Neerti Date: Wed, 29 Nov 2017 19:57:43 -0500 Subject: [PATCH] Removes Sif Vacuum Caves Instead of vacuum, cleared rocks on Sif should produce cold air similar to the ambient temperature. --- maps/southern_cross/southern_cross-3.dmm | 18 ++--- maps/southern_cross/southern_cross-4.dmm | 10 +-- maps/southern_cross/turfs/outdoors.dm | 84 ++++++++++++++++-------- 3 files changed, 70 insertions(+), 42 deletions(-) diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index df63dcac79..6a1db6078e 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -5,13 +5,13 @@ "ae" = (/obj/effect/step_trigger/teleporter/mine/to_mining,/turf/simulated/floor/outdoors/dirt/sif/planetuse,/area/surface/north) "af" = (/turf/unsimulated/wall/planetary/sif{icon_state = "rock-dark"},/area/surface/northeast) "ag" = (/turf/simulated/floor/outdoors/snow/sif/planetuse,/area/surface/northwest) -"ah" = (/turf/simulated/mineral,/area/surface/northwest) -"ai" = (/obj/effect/zone_divider,/turf/simulated/mineral,/area/surface/north) -"aj" = (/turf/simulated/mineral,/area/surface/north) -"ak" = (/turf/simulated/mineral/ignore_mapgen,/area/surface/north) +"ah" = (/turf/simulated/mineral/sif,/area/surface/northwest) +"ai" = (/obj/effect/zone_divider,/turf/simulated/mineral/sif,/area/surface/north) +"aj" = (/turf/simulated/mineral/sif,/area/surface/north) +"ak" = (/turf/simulated/mineral/ignore_mapgen/sif,/area/surface/north) "al" = (/obj/structure/cable/ender{icon_state = "1-2"; id = "surface_cave"},/obj/effect/overlay/snow/floor,/turf/simulated/floor/tiled/steel/sif/planetuse,/area/surface/north) "am" = (/turf/simulated/floor/outdoors/dirt/sif/planetuse,/area/surface/north) -"an" = (/turf/simulated/mineral,/area/surface/northeast) +"an" = (/turf/simulated/mineral/sif,/area/surface/northeast) "ao" = (/turf/unsimulated/wall/planetary/sif,/area/surface/northeast) "ap" = (/turf/simulated/floor/outdoors/snow/sif/planetuse,/area/surface/north) "aq" = (/obj/structure/cable/heavyduty{icon_state = "1-2"},/obj/effect/overlay/snow/floor,/turf/simulated/floor/tiled/steel/sif/planetuse,/area/surface/north) @@ -941,8 +941,8 @@ "se" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/effect/zone_divider,/turf/simulated/floor/water/deep/pool,/area/surface/outpost/main/pool) "sf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/table/glass,/obj/effect/zone_divider,/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/pool) "sg" = (/obj/structure/table/glass,/obj/effect/zone_divider,/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/pool) -"sh" = (/obj/effect/zone_divider,/turf/simulated/mineral,/area/surface/center) -"si" = (/obj/effect/zone_divider,/turf/simulated/mineral,/area/surface/northeast) +"sh" = (/obj/effect/zone_divider,/turf/simulated/mineral/sif,/area/surface/center) +"si" = (/obj/effect/zone_divider,/turf/simulated/mineral/sif,/area/surface/northeast) "sj" = (/turf/unsimulated/wall/planetary/sif,/area/surface/west) "sk" = (/turf/simulated/floor/outdoors/snow/sif/planetuse,/area/surface/west) "sl" = (/turf/simulated/floor/outdoors/snow/sif/planetuse,/area/surface/center) @@ -950,8 +950,8 @@ "sn" = (/obj/structure/cable/heavyduty{icon_state = "1-2"},/obj/effect/overlay/snow/floor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel/sif/planetuse,/area/surface/center) "so" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/pool) "sp" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/pool) -"sq" = (/turf/simulated/mineral,/area/surface/center) -"sr" = (/turf/simulated/mineral,/area/surface/east) +"sq" = (/turf/simulated/mineral/sif,/area/surface/center) +"sr" = (/turf/simulated/mineral/sif,/area/surface/east) "ss" = (/turf/unsimulated/wall/planetary/sif,/area/surface/east) "st" = (/obj/effect/floor_decal/spline/plain{dir = 10},/turf/simulated/floor/water/pool,/area/surface/outpost/main/pool) "su" = (/obj/effect/floor_decal/spline/plain,/turf/simulated/floor/water/pool,/area/surface/outpost/main/pool) diff --git a/maps/southern_cross/southern_cross-4.dmm b/maps/southern_cross/southern_cross-4.dmm index fd3177f536..44071dfbe0 100644 --- a/maps/southern_cross/southern_cross-4.dmm +++ b/maps/southern_cross/southern_cross-4.dmm @@ -1,7 +1,7 @@ "aa" = (/turf/unsimulated/wall/planetary/sif,/area/mine/unexplored) -"ab" = (/turf/simulated/mineral,/area/mine/unexplored) -"ac" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"ad" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/unexplored) +"ab" = (/turf/simulated/mineral/sif,/area/mine/unexplored) +"ac" = (/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/mine/explored) +"ad" = (/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/mine/unexplored) "ae" = (/obj/machinery/conveyor{dir = 2; id = "anolongstorage"},/turf/simulated/floor/plating,/area/surface/outpost/research/xenoarcheology) "af" = (/turf/simulated/floor/plating,/area/surface/outpost/research/xenoarcheology) "ag" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/surface/outpost/research/xenoarcheology) @@ -244,7 +244,7 @@ "eJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; use_power = 0},/obj/machinery/light,/turf/simulated/floor/reinforced,/area/surface/outpost/research/xenoarcheology/isolation_b) "eK" = (/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,/obj/machinery/alarm/monitor/isolation{alarm_id = "isolation_two"; dir = 1; pixel_x = 0; pixel_y = -22},/turf/simulated/floor/reinforced,/area/surface/outpost/research/xenoarcheology/isolation_b) "eL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Isolation Cell 2"; dir = 1},/turf/simulated/floor/reinforced,/area/surface/outpost/research/xenoarcheology/isolation_b) -"eM" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/space) +"eM" = (/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/space) "eN" = (/obj/machinery/door/airlock/research{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "xenoarch1_airlock_exterior"; locked = 1; name = "Research Exterior Airlock"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "xenoarch1_airlock_control"; name = "Xenoarch Access Button"; pixel_x = 0; pixel_y = -24; req_access = null},/turf/simulated/floor/tiled,/area/surface/outpost/research/xenoarcheology) "eO" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/simulated/floor/tiled,/area/surface/outpost/research/xenoarcheology) "eP" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/research/xenoarcheology) @@ -416,7 +416,7 @@ "hZ" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/emergency,/obj/item/clothing/accessory/armband/science,/obj/item/clothing/glasses/science,/obj/item/device/suit_cooling_unit,/obj/item/weapon/extinguisher,/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/surface/outpost/research/xenoarcheology/emergencystorage) "ia" = (/obj/structure/cable/ender{icon_state = "1-2"; id = "surface_cave"},/turf/simulated/floor/plating{tag = "icon-asteroidplating2"; icon_state = "asteroidplating2"},/area/mine/explored) "ib" = (/turf/unsimulated/wall,/area/mine/unexplored) -"ic" = (/obj/effect/step_trigger/teleporter/mine/from_mining,/turf/simulated/mineral/floor/ignore_mapgen,/area/space) +"ic" = (/obj/effect/step_trigger/teleporter/mine/from_mining,/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/space) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/southern_cross/turfs/outdoors.dm b/maps/southern_cross/turfs/outdoors.dm index 02bec4b3e6..08b8626730 100644 --- a/maps/southern_cross/turfs/outdoors.dm +++ b/maps/southern_cross/turfs/outdoors.dm @@ -1,50 +1,78 @@ // Sif Planetside stuff +#define O2SIF 0.181 +#define N2SIF 0.819 + +#define MOLES_CELLSIF 114.50978 + +#define MOLES_O2SIF (MOLES_CELLSIF * O2SIF) // O2 value on Sif(18%) +#define MOLES_N2SIF (MOLES_CELLSIF * N2SIF) // N2 value on Sif(82%) + +#define TEMPERATURE_SIF 243.15 // Roughly -30C / -22F /turf/simulated/floor/outdoors/mud/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF /turf/simulated/floor/outdoors/rocks/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF /turf/simulated/floor/tiled/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF outdoors = TRUE /turf/simulated/floor/tiled/steel/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF outdoors = TRUE /turf/simulated/floor/plating/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF outdoors = TRUE /turf/simulated/floor/outdoors/snow/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F - + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF /turf/simulated/floor/outdoors/grass/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF /turf/simulated/floor/outdoors/grass/sif/forest/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF /turf/simulated/floor/outdoors/dirt/sif/planetuse - oxygen = 114.50978 * 0.181 - nitrogen = 114.50978 * 0.819 - temperature = 243.15 // Roughly -30C / -22F \ No newline at end of file + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF + +/turf/simulated/mineral/sif + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF + +/turf/simulated/mineral/ignore_mapgen/sif + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF + +/turf/simulated/mineral/floor/sif + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF + +/turf/simulated/mineral/floor/ignore_mapgen/sif + oxygen = MOLES_O2SIF + nitrogen = MOLES_N2SIF + temperature = TEMPERATURE_SIF \ No newline at end of file