diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index ffa6f78973..21cdcc6be6 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -167,7 +167,7 @@ #define LAVALAND_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300" //SNOSTATION -#define ICEMOON_DEFAULT_ATMOS "o2=14;n2=23;TEMP=80" +#define ICEMOON_DEFAULT_ATMOS "o2=22;n2=82;TEMP=180" //ATMOSIA GAS MONITOR TAGS #define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in" diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 715f17af92..8e4c363227 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -58,6 +58,11 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng else if(isarea(areatype)) var/area/areatemp = areatype areatype = areatemp.type + else if(islist(areatype)) + var/list/turfs = list() + for(var/A in areatype) + turfs += get_area_turfs(A) + return turfs else if(!ispath(areatype)) return null diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 720490942a..eade304e2b 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -48,7 +48,7 @@ "oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "carpetsymbol", "carpetstar", "carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5", "ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11", - "ironsand12", "ironsand13", "ironsand14", "ironsand15") + "ironsand12", "ironsand13", "ironsand14", "ironsand15", "snow", "snow0", "snow1", "snow2", "snow3", "snow4", "snow5", "snow6", "snow7", "snow8", "snow9", "snow10", "snow11", "snow12", "snow-ice", "snow_dug") if(broken || burnt || (icon_state in icons_to_ignore_at_floor_init)) //so damaged/burned tiles or plating icons aren't saved as the default icon_regular_floor = "floor" else diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index f3b4cbddc9..358fc5ad50 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -557,7 +557,7 @@ dwidth = 1 width = 3 height = 4 - var/target_area = /area/lavaland/surface/outdoors + var/target_area = list(/area/lavaland/surface/outdoors, /area/icemoon/underground/unexplored/rivers) var/edge_distance = 16 // Minimal distance from the map edge, setting this too low can result in shuttle landing on the edge and getting "sliced" diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi index d71431f99a..e601f771d3 100644 Binary files a/icons/turf/snow.dmi and b/icons/turf/snow.dmi differ