shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/weather.dm
+7 -7
View File
@@ -1,7 +1,7 @@
//Used for all kinds of weather, ex. lavaland ash storms.
var/datum/subsystem/weather/SSweather
/datum/subsystem/weather
var/datum/controller/subsystem/weather/SSweather
/datum/controller/subsystem/weather
name = "Weather"
flags = SS_BACKGROUND
wait = 10
@@ -9,10 +9,10 @@ var/datum/subsystem/weather/SSweather
var/list/existing_weather = list()
var/list/eligible_zlevels = list(ZLEVEL_LAVALAND)
/datum/subsystem/weather/New()
/datum/controller/subsystem/weather/New()
NEW_SS_GLOBAL(SSweather)
/datum/subsystem/weather/fire()
/datum/controller/subsystem/weather/fire()
for(var/V in processing)
var/datum/weather/W = V
if(W.aesthetic)
@@ -31,13 +31,13 @@ var/datum/subsystem/weather/SSweather
eligible_zlevels -= Z
addtimer(CALLBACK(src, .proc/make_z_eligible, Z), rand(3000, 6000) + W.weather_duration_upper, TIMER_UNIQUE) //Around 5-10 minutes between weathers
/datum/subsystem/weather/Initialize(start_timeofday)
/datum/controller/subsystem/weather/Initialize(start_timeofday)
..()
for(var/V in subtypesof(/datum/weather))
var/datum/weather/W = V
new W //weather->New will handle adding itself to the list
/datum/subsystem/weather/proc/run_weather(weather_name, Z)
/datum/controller/subsystem/weather/proc/run_weather(weather_name, Z)
if(!weather_name)
return
for(var/V in existing_weather)
@@ -45,5 +45,5 @@ var/datum/subsystem/weather/SSweather
if(W.name == weather_name && W.target_z == Z)
W.telegraph()
/datum/subsystem/weather/proc/make_z_eligible(zlevel)
/datum/controller/subsystem/weather/proc/make_z_eligible(zlevel)
eligible_zlevels |= zlevel