cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4059 from VOREStation/upstream-merge-5424

Browse Source 
[MIRROR] Fixes indoor weather, hopefully for real this time.
This commit is contained in:
Spades
2018-09-01 18:51:01 -04:00
committed by GitHub
parent af3df2f511 8b7fbbe98c
commit 2ed363323d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/planets.dm
+1 -1
View File
@@ -63,7 +63,7 @@ SUBSYSTEM_DEF(planets)
while(currentlist.len)
var/turf/simulated/OT = currentlist[currentlist.len]
currentlist.len--
if(istype(OT) && z_to_planet.len >= OT.z && 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
code/game/objects/items/weapons/RCD.dm
+1 -1
View File
@@ -153,7 +153,7 @@
return 0
if(build_turf)
T.ChangeTurf(build_turf)
T.ChangeTurf(build_turf, preserve_outdoors = TRUE)
else if(build_other)
new build_other(T)
else
code/game/turfs/simulated/floor_attackby.dm
+2 -2
View File
@@ -33,7 +33,7 @@
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
T.ReplaceWithLattice()
T.ChangeTurf(/turf/simulated/floor)
T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] patches a hole in the ceiling.</span>", "<span class='notice'>You patch a hole in the ceiling.</span>")
expended_tile = TRUE
@@ -156,4 +156,4 @@
return
if(flooring)
return
attackby(T, user)
attackby(T, user)
code/game/turfs/simulated/wall_attacks.dm
+1 -1
View File
@@ -160,7 +160,7 @@
if(istype(T, /turf/simulated/open) || istype(T, /turf/space))
if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating
T.ReplaceWithLattice()
T.ChangeTurf(/turf/simulated/floor)
T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] patches a hole in the ceiling.</span>", "<span class='notice'>You patch a hole in the ceiling.</span>")
expended_tile = TRUE
code/game/turfs/turf_changing.dm
+4 -4
View File
@@ -22,17 +22,15 @@
below.update_icon() // To add or remove the 'ceiling-less' overlay.
//Creates a new turf
/turf/proc/ChangeTurf(var/turf/N, var/tell_universe=1, var/force_lighting_update = 0)
/turf/proc/ChangeTurf(var/turf/N, var/tell_universe=1, var/force_lighting_update = 0, var/preserve_outdoors = FALSE)
if (!N)
return
/* VOREStation Edit Start - Say Nope To This. Tether's Z info is setup fine, trust it.
// This makes sure that turfs are not changed to space when one side is part of a zone
if(N == /turf/space)
var/turf/below = GetBelow(src)
if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)))
N = /turf/simulated/open
*/ // VOREStation Edit End
var/obj/fire/old_fire = fire
var/old_opacity = opacity
@@ -109,4 +107,6 @@
lighting_build_overlay()
else
lighting_clear_overlay()
outdoors = old_outdoors
if(preserve_outdoors)
outdoors = old_outdoors