From f886367ea267263c4da14627e634917a1c910727 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Wed, 28 Apr 2021 18:50:42 -0600 Subject: [PATCH] Weather 1 and atmos fixes --- code/datums/weather/weather_types/layenia.dm | 19 ++++++++++--------- code/game/area/areas/layenia.dm | 1 + code/game/turfs/simulated/chasm.dm | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/code/datums/weather/weather_types/layenia.dm b/code/datums/weather/weather_types/layenia.dm index 25613b98..e551c788 100644 --- a/code/datums/weather/weather_types/layenia.dm +++ b/code/datums/weather/weather_types/layenia.dm @@ -1,35 +1,36 @@ -/datum/weather/layenia +/datum/weather/ash_storm/layenia //because fuck writing my own code name = "Layenia Weather" desc = "A subset of weather affecting Layenia" + weather_color = "white" telegraph_message = "Thundering clouds pass overhead, swept up by a steady wind." telegraph_duration = 300 telegraph_overlay = "light_snow" - telegraph_sound = 'sound/ambience/acidrain_start.ogg' weather_message = "Clouds storm over the station slowly..." weather_duration_lower = 600 weather_duration_upper = 8200 weather_overlay = "snow_storm" - weather_sound = 'sound/ambience/acidrain_mid.ogg' end_message = "Sunlight arches over the station once more; the storm has passed." end_duration = 300 end_overlay = "light_snow" - end_sound = 'sound/ambience/acidrain_end.ogg' area_type = /area/layenia - target_trait = ZTRAIT_AWAY + target_trait = ZTRAIT_STATION probability = 100 barometer_predictable = TRUE + aesthetic = TRUE -///datum/weather/layenia/telegraph() +//datum/weather/layenia/telegraph() -///datum/weather/layenia/start() +//datum/weather/layenia/start() -///datum/weather/layenia/wind_down() +//datum/weather/layenia/wind_down() -///datum/weather/layenia/end() +//datum/weather/layenia/end() + +//datum/weather/ash_storm/layenia/weather_act diff --git a/code/game/area/areas/layenia.dm b/code/game/area/areas/layenia.dm index 1e656536..d21b54b6 100644 --- a/code/game/area/areas/layenia.dm +++ b/code/game/area/areas/layenia.dm @@ -7,6 +7,7 @@ area/layenia outdoors = TRUE dynamic_lighting = DYNAMIC_LIGHTING_DISABLED ambientsounds = MINING + atmos = TRUE area/layenia/cloudlayer name = "Laneya clouds" diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 6ee5a693..873f8639 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -126,6 +126,7 @@ tiled_dirt = FALSE baseturfs = /turf/open/chasm/cloud smooth = SMOOTH_FALSE + initial_gas_mix = FROZEN_ATMOS /turf/open/chasm/cloud/Initialize() . = ..()