This commit is contained in:
Ghommie
2019-11-12 19:00:45 +01:00
parent c5a7c28a1b
commit 4ef1d64356
8 changed files with 2873 additions and 2590 deletions
+3 -3
View File
@@ -4,8 +4,6 @@
icon_state = "grey"
baseturfs = /turf/open/openspace
CanAtmosPassVertical = ATMOS_PASS_YES
plane = FLOOR_OPENSPACE_PLANE
layer = OPENSPACE_LAYER
//mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/can_cover_up = TRUE
var/can_build_on = TRUE
@@ -14,8 +12,10 @@
..()
return TRUE
/turf/open/openspace/Initialize()
/turf/open/openspace/Initialize() // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
. = ..()
plane = FLOOR_OPENSPACE_PLANE
layer = OPENSPACE_LAYER
return INITIALIZE_HINT_LATELOAD
/turf/open/openspace/LateInitialize()
+11 -5
View File
@@ -141,11 +141,18 @@
/turf/proc/zAirOut(direction, turf/source)
return FALSE
/turf/proc/zImpact(atom/movable/A, levels = 1)
/turf/proc/zImpact(atom/movable/A, levels = 1, turf/prev_turf)
var/flags = NONE
var/mov_name = A.name
for(var/i in contents)
var/atom/thing = i
if(thing.intercept_zImpact(A, levels))
return FALSE
flags |= thing.intercept_zImpact(A, levels)
if(flags & FALL_STOP_INTERCEPTING)
break
if(prev_turf && !(flags & FALL_NO_MESSAGE))
prev_turf.visible_message("<span class='danger'>[mov_name] falls through [prev_turf]!</span>")
if(flags & FALL_INTERCEPTED)
return
if(zFall(A, ++levels))
return FALSE
A.visible_message("<span class='danger'>[A] crashes into [src]!</span>")
@@ -161,11 +168,10 @@
return FALSE
if(!force && (!can_zFall(A, levels, target) || !A.can_zFall(src, levels, target, DOWN)))
return FALSE
A.visible_message("<span class='danger'>[A] falls through [src]!</span>")
A.zfalling = TRUE
A.forceMove(target)
A.zfalling = FALSE
target.zImpact(A, levels)
target.zImpact(A, levels, src)
return TRUE
/turf/proc/handleRCL(obj/item/twohanded/rcl/C, mob/user)