Merge branch 'master' into upstream-merge-37486
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
/turf/open
|
||||
plane = FLOOR_PLANE
|
||||
var/slowdown = 0 //negative for faster, positive for slower
|
||||
|
||||
var/mutable_appearance/wet_overlay
|
||||
|
||||
@@ -117,9 +117,8 @@
|
||||
|
||||
/turf/open/floor/engine/cult
|
||||
name = "engraved floor"
|
||||
desc = "The air hangs heavy over this sinister flooring."
|
||||
desc = "The air smells strangely over this sinister flooring."
|
||||
icon_state = "plating"
|
||||
CanAtmosPass = ATMOS_PASS_NO
|
||||
floor_tile = null
|
||||
var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance
|
||||
|
||||
|
||||
@@ -343,7 +343,7 @@
|
||||
|
||||
for(var/V in contents)
|
||||
var/atom/A = V
|
||||
if(A.level >= affecting_level)
|
||||
if(!QDELETED(A) && A.level >= affecting_level)
|
||||
if(ismovableatom(A))
|
||||
var/atom/movable/AM = A
|
||||
if(!AM.ex_check(explosion_id))
|
||||
|
||||
Reference in New Issue
Block a user