Merge pull request #5420 from Neerti/weather_visual_fix

Fixes Indoor Weather
This commit is contained in:
Anewbe
2018-07-18 14:20:56 -05:00
committed by GitHub
3 changed files with 5 additions and 6 deletions
+3 -2
View File
@@ -56,6 +56,7 @@ 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
@@ -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
+1 -2
View File
@@ -47,8 +47,7 @@
var/turf/A = get_step(src, dir)
if(A && !A.outdoors)
if(expended_tile || R.use(1))
src.outdoors = FALSE
SSplanets.unallocateTurf(src)
make_indoors()
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] roofs a tile, shielding it from the elements.</span>", "<span class='notice'>You roof this tile, shielding it from the elements.</span>")
break
+1 -2
View File
@@ -171,8 +171,7 @@
// Create a ceiling to shield from the weather
if(outdoors)
if(expended_tile || R.use(1)) // Don't need to check adjacent turfs for a wall, we're building on one
outdoors = FALSE
SSplanets.unallocateTurf(src)
make_indoors()
if(!expended_tile) // Would've already played a sound
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] roofs \the [src], shielding it from the elements.</span>", "<span class='notice'>You roof \the [src] tile, shielding it from the elements.</span>")