cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 13:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into make_ai_great_again

Browse Source
This commit is contained in:
Anewbe
2018-07-21 12:49:19 -05:00
parent 94aa7f6745 e29884bfdf
commit 64d16a0a56
116 changed files with 1379 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/controllers/subsystems/planets.dm
View File

@@ -56,13 +56,14 @@ SUBSYSTEM_DEF(planets)
P.planet_floors -= T
else
P.planet_walls -= T
T.vis_contents -= P.weather_holder.visuals
/datum/controller/subsystem/planets/proc/allocateTurfs(var/initial = FALSE)
var/list/currentlist = new_outdoor_turfs
while(currentlist.len)
var/turf/simulated/OT = currentlist[currentlist.len]
currentlist.len--
if(istype(OT) && z_to_planet[OT.z])
if(istype(OT) && OT.outdoors && z_to_planet.len >= OT.z && z_to_planet[OT.z])
var/datum/planet/P = z_to_planet[OT.z]
P.planet_floors |= OT
OT.vis_contents |= P.weather_holder.visuals
@@ -73,7 +74,7 @@ SUBSYSTEM_DEF(planets)
while(currentlist.len)
var/turf/unsimulated/wall/planetary/PW = currentlist[currentlist.len]
currentlist.len--
if(istype(PW) && z_to_planet[PW.z])
if(istype(PW) && z_to_planet.len >= PW.z && z_to_planet[PW.z])
var/datum/planet/P = z_to_planet[PW.z]
P.planet_walls |= PW
if(!initial && MC_TICK_CHECK)
@@ -113,9 +114,9 @@ SUBSYSTEM_DEF(planets)
while(currentrun.len)
var/datum/planet/P = currentrun[currentrun.len]
currentrun.len--
P.process(last_fire)
//Sun light needs changing
if(P.needs_work & PLANET_PROCESS_SUN)
P.needs_work &= ~PLANET_PROCESS_SUN