mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-09 13:47:07 +00:00
Compare commits
2 Commits
37581a60fe
...
7fdf7a4041
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fdf7a4041 | ||
|
|
42689bc40e |
@@ -373,7 +373,7 @@ SUBSYSTEM_DEF(zcopy)
|
||||
var/atom/movable/openspace/turf_mimic/DC = T.below.mimic_above_copy
|
||||
DC.appearance = T.below
|
||||
DC.mouse_opacity = initial(DC.mouse_opacity)
|
||||
DC.plane = OPENTURF_MAX_PLANE - turf_depth - 1
|
||||
DC.plane = OPENTURF_MAX_PLANE
|
||||
|
||||
else if (T.below.mimic_above_copy)
|
||||
QDEL_NULL(T.below.mimic_above_copy)
|
||||
@@ -555,7 +555,8 @@ SUBSYSTEM_DEF(zcopy)
|
||||
if (/atom/movable/openspace/turf_proxy, /atom/movable/openspace/turf_mimic)
|
||||
OO.depth += 1
|
||||
if (/atom/movable/openspace/multiplier)
|
||||
OO.depth += 1
|
||||
// Ignore override depth for these.
|
||||
OO.depth = min(zlev_maximums[OO.z] - original_z + 1, OPENTURF_MAX_DEPTH)
|
||||
|
||||
OO.mimiced_type = original_type
|
||||
OO.override_depth = override_depth
|
||||
@@ -803,7 +804,7 @@ var/list/zmimic_fixed_planes = list(
|
||||
for (var/atom/movable/openspace/O in T)
|
||||
found_oo += O
|
||||
|
||||
if (T.shadower.overlays.len)
|
||||
if (T.shadower?.overlays.len)
|
||||
for (var/overlay in T.shadower.overlays)
|
||||
var/atom/movable/openspace/debug/D = new
|
||||
D.appearance = overlay
|
||||
@@ -863,7 +864,7 @@ var/list/zmimic_fixed_planes = list(
|
||||
/datum/controller/subsystem/zcopy/proc/debug_fmt_thing(atom/A, list/out, turf/original)
|
||||
if (istype(A, /atom/movable/openspace/mimic))
|
||||
var/atom/movable/openspace/mimic/OO = A
|
||||
var/base = "<li>[fmt_label("Mimic", A)] plane [A.plane], layer [A.layer], depth [FMT_DEPTH(OO.depth)]"
|
||||
var/base = "<li>[fmt_label("Mimic", A)] plane [A.plane], layer [A.layer], depth [FMT_DEPTH(OO.depth)], override depth [FMT_DEPTH(OO.override_depth)]"
|
||||
if (QDELETED(OO.associated_atom)) // This shouldn't happen, but can if the deletion hook is not working.
|
||||
return "[base] - [OO.type] copying <unknown> ([OO.mimiced_type]) - <font color='red'>ORPHANED</font></em></li>"
|
||||
|
||||
|
||||
@@ -153,6 +153,7 @@
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
atom_flags |= ATOM_INITIALIZED
|
||||
SSzcopy.openspace_overlays += 1
|
||||
loc?.Entered(src, null)
|
||||
|
||||
/atom/movable/openspace/mimic/Destroy()
|
||||
SSzcopy.openspace_overlays -= 1
|
||||
|
||||
Reference in New Issue
Block a user