cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3035 from Neerti/3/2/2017_example_map

Browse Source 
Adds Multi-Z Test Map
This commit is contained in:
Anewbe
2017-03-04 15:26:49 -06:00
committed by GitHub
parent c831df104b d5438dc36d
commit 283071d9db
21 changed files with 705 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/effects/effect_system.dm
View File

@@ -333,7 +333,7 @@ steam.start() -- spawns the effect
spawn(0)
var/turf/T = get_turf(src.holder)
if(T != src.oldposition)
if(istype(T, /turf/space))
if(istype(T, /turf/simulated))
var/obj/effect/effect/ion_trails/I = PoolOrNew(/obj/effect/effect/ion_trails, src.oldposition)
src.oldposition = T
I.set_dir(src.holder.dir)

5
code/game/objects/structures/lattice.dm
View File

@@ -34,6 +34,11 @@
if(locate(/obj/structure/lattice, get_step(src, dir)))
L = locate(/obj/structure/lattice, get_step(src, dir))
L.updateOverlays(src.loc)
if(istype(loc, /turf/simulated/open))
var/turf/simulated/open/O = loc
spawn(1)
if(O) // If we built a new floor with the lattice, the open turf won't exist anymore.
O.update() // This lattice may be supporting things on top of it. If it's being deleted, they need to fall down.
..()
/obj/structure/lattice/ex_act(severity)