Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hopefully fixes indoor weather? #1117

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/controllers/subsystem/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
9 changes: 4 additions & 5 deletions code/datums/weather/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
14 changes: 6 additions & 8 deletions code/datums/weather/weather_types/roguetown/rain.dm
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@

/datum/weather/rain
name = "rain"
desc = ""

telegraph_duration = 10 SECONDS
telegraph_message = "<span class='warning'>The sky begins to weep.</span>"
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)
Expand Down Expand Up @@ -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()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/particles/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/obj/emitters/weather/rain
particles = new/particles/rain
// alpha = 190
alpha = 190

/atom/movable/screen/weather/fog
alpha = 180
Expand Down
Binary file added sound/ambience/rain.ogg
Binary file not shown.
Loading