diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 2f7d2d0a71..cb933e4ad1 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -50,14 +50,14 @@ SUBSYSTEM_DEF(weather) return // start random weather on relevant levels -/* for(var/z in eligible_zlevels) + for(var/z in eligible_zlevels) var/possible_weather = eligible_zlevels[z] var/datum/weather/W = pickweight(possible_weather) run_weather(W, list(text2num(z))) eligible_zlevels -= z var/randTime = rand(3000, 6000) addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(W.weather_duration_upper), TIMER_UNIQUE) //Around 5-10 minutes between weathers - next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration)*/ + next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration) /datum/controller/subsystem/weather/Initialize(start_timeofday) for(var/V in subtypesof(/datum/weather)) diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index b6811d276f..9392d22d00 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -170,7 +170,7 @@ return TRUE /datum/weather/proc/update_areas(input, specific_area, specific_turf) -/* + for(var/area/N in impacted_areas) N.blend_mode = 0 N.layer = overlay_layer @@ -190,7 +190,7 @@ N.icon = 'icons/turf/areas.dmi' N.layer = initial(N.layer) N.plane = initial(N.plane) - N.set_opacity(FALSE)*/ + N.set_opacity(FALSE) if(specific_area) for(var/i in specific_area) var/area/N = i @@ -206,12 +206,11 @@ START_PROCESSING(SSweather,T) /datum/weather/proc/get_used_state() -/* switch(stage) + switch(stage) if(STARTUP_STAGE) return telegraph_overlay if(MAIN_STAGE) return weather_overlay if(WIND_DOWN_STAGE) return end_overlay - return ""*/ //thsi bugs out when rain falls then u set off a bomb - return weather_overlay + return "" //thsi bugs out when rain falls then u set off a bomb diff --git a/code/datums/weather/weather_types/roguetown/rain.dm b/code/datums/weather/weather_types/roguetown/rain.dm index 60b121e7f5..d6f0f209c1 100644 --- a/code/datums/weather/weather_types/roguetown/rain.dm +++ b/code/datums/weather/weather_types/roguetown/rain.dm @@ -1,24 +1,23 @@ - /datum/weather/rain name = "rain" desc = "" telegraph_duration = 10 SECONDS - telegraph_message = "The sky begins to weep." - telegraph_sound = 'sound/blank.ogg' + telegraph_message = span_warning("The sky begins to weep.") + telegraph_sound = 'sound/ambience/rainin.ogg' weather_message = "" weather_overlay = "rain1" weather_duration_lower = 5 MINUTES weather_duration_upper = 12 MINUTES - weather_sound = 'sound/blank.ogg' + weather_sound = 'sound/ambience/rain.ogg' weather_alpha = 200 probability = 3 end_duration = 5 SECONDS end_message = "" - end_sound = 'sound/blank.ogg' + end_sound = 'sound/ambience/rainout.ogg' area_type = /area/rogue/outdoors protected_areas = list(/area/rogue/indoors,/area/rogue/under) @@ -104,9 +103,8 @@ if(istype(A, /area/rogue/indoors)) M.playsound_local(M, pick('sound/ambience/noises/thunin (1).ogg','sound/ambience/noises/thunin (2).ogg','sound/ambience/noises/thunin (3).ogg','sound/ambience/noises/thunin (4).ogg'), 100, FALSE) continue -// testing("dolightingflash") -// for(var/obj/machinery/light/sun/L in GLOB.machines) -// L.lightningflash() + /*for(var/obj/machinery/light/sun/L in GLOB.machines) + L.lightningflash()*/ /datum/weather/rain/start() . = ..() diff --git a/code/game/objects/effects/particles/weather.dm b/code/game/objects/effects/particles/weather.dm index 7ac12e76a6..7aa744653e 100644 --- a/code/game/objects/effects/particles/weather.dm +++ b/code/game/objects/effects/particles/weather.dm @@ -22,7 +22,7 @@ /obj/emitters/weather/rain particles = new/particles/rain -// alpha = 190 + alpha = 190 /atom/movable/screen/weather/fog alpha = 180 diff --git a/sound/ambience/rain.ogg b/sound/ambience/rain.ogg new file mode 100644 index 0000000000..7e36e70d96 Binary files /dev/null and b/sound/ambience/rain.ogg differ