cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes most hard-coded z level checks

Browse Source
This commit is contained in:
Crazylemon64
2016-07-31 21:29:03 -07:00
parent f54de64a73
commit bf2bcbce67
122 changed files with 325 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/Processes/shuttles.dm
+2 -4
View File
@@ -164,8 +164,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
continue
var/turf/T = get_turf(thing)
// TODO: Tie into space manager
if(T && T.z == ZLEVEL_STATION)
if(T && is_station_level(T.z))
callShuttle = 0
break
@@ -210,8 +209,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
if(!M.roundstart_move)
continue
for(var/obj/docking_port/stationary/S in stationary)
// TODO: Tie into space manager
if(S.z != ZLEVEL_STATION && findtext(S.id, M.id))
if(is_station_level(S.z) && findtext(S.id, M.id))
S.width = M.width
S.height = M.height
S.dwidth = M.dwidth
code/controllers/Processes/weather.dm
+2 -2
View File
@@ -1,5 +1,5 @@
// TODO: Tie into space manager
//Used for all kinds of weather, ex. lavaland ash storms.
// TODO: This could probably be better-integrated with the space manager
var/global/datum/controller/process/weather/weather_master
/datum/controller/process/weather
@@ -33,7 +33,7 @@ var/global/datum/controller/process/weather/weather_master
var/list/possible_weather_for_this_z = list()
for(var/V in existing_weather)
var/datum/weather/WE = V
if(WE.target_z == Z && WE.probability) //Another check so that it doesn't run extra weather
if(WE.target_level == Z && WE.probability) //Another check so that it doesn't run extra weather
possible_weather_for_this_z[WE] = WE.probability
var/datum/weather/W = pickweight(possible_weather_for_this_z)
run_weather(W.name)