Merge pull request #2360 from Citadel-Station-13/upstream-merge-29828
[MIRROR] Fixes turf slipping
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
var/sound
|
||||
|
||||
/turf/open/indestructible/sound/Entered(var/mob/AM)
|
||||
..()
|
||||
if(istype(AM))
|
||||
playsound(src,sound,50,1)
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
return
|
||||
|
||||
/turf/open/chasm/Entered(atom/movable/AM)
|
||||
..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
drop_stuff(AM)
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
dir = EAST
|
||||
|
||||
/turf/open/space/transit/Entered(atom/movable/AM, atom/OldLoc)
|
||||
..()
|
||||
if(!locate(/obj/structure/lattice) in src)
|
||||
throw_atom(AM)
|
||||
|
||||
|
||||
@@ -160,6 +160,7 @@
|
||||
return TRUE //Nothing found to block so return success!
|
||||
|
||||
/turf/Entered(atom/movable/AM)
|
||||
..()
|
||||
if(explosion_level && AM.ex_check(explosion_id))
|
||||
AM.ex_act(explosion_level)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user