Remove 511 compatibility things

This commit is contained in:
variableundefined
2018-10-21 21:54:50 +08:00
parent d4376fff69
commit 0dc7b39740
3 changed files with 5 additions and 27 deletions
+1 -7
View File
@@ -248,8 +248,6 @@ SUBSYSTEM_DEF(garbage)
qdel(D, force)
#endif
/proc/KillMeIn512(sendsignal)
return 1
// Should be treated as a replacement for the 'del' keyword.
// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
/proc/qdel(datum/D, force = FALSE, ...)
@@ -263,17 +261,13 @@ SUBSYSTEM_DEF(garbage)
if(isnull(D.gc_destroyed))
#if DM_VERSION > 511
#warn Remove the garbage bypass code below
#endif
if(SEND_SIGNAL(D, COMSIG_PARENT_QDELETED, force)) // Give the components a chance to prevent their parent from being deleted
return
D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
var/start_time = world.time
var/start_tick = world.tick_usage
var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
var/Removein512too = SEND_SIGNAL(D, COMSIG_PARENT_QDELETED, force, hint) // Let the (remaining) components know about the result of Destroy
KillMeIn512(Removein512too)
SEND_SIGNAL(D, COMSIG_PARENT_QDELETED, force, hint) // Let the (remaining) components know about the result of Destroy
if(world.time != start_time)
I.slept_destroy++
else
+3 -15
View File
@@ -56,11 +56,7 @@
if(!force)
_RemoveFromParent()
if(!silent)
#if DM_VERSION > 511
#warn Remove the garbage bypass code below
#endif
var/Removein512 = SEND_SIGNAL(P, COMSIG_COMPONENT_REMOVING, src)
KillMeIn512(Removein512)
SEND_SIGNAL(P, COMSIG_COMPONENT_REMOVING, src)
parent = null
for(var/target in signal_procs)
UnregisterSignal(target, signal_procs[target])
@@ -262,11 +258,7 @@
new_comp = new nt(arglist(args)) // Dupes are allowed, act like normal
if(!old_comp && !QDELETED(new_comp)) // Nothing related to duplicate components happened and the new component is healthy
#if DM_VERSION > 511
#warn Remove the garbage bypass code below
#endif
var/Removein512 = SEND_SIGNAL(src, COMSIG_COMPONENT_ADDED, new_comp)
KillMeIn512(Removein512)
SEND_SIGNAL(src, COMSIG_COMPONENT_ADDED, new_comp)
return new_comp
return old_comp
@@ -286,11 +278,7 @@
qdel(C)
return
C._RemoveFromParent()
#if DM_VERSION > 511
#warn Remove the garbage bypass code below
#endif
var/Removein512 = SEND_SIGNAL(helicopter, COMSIG_COMPONENT_REMOVING, C)
KillMeIn512(Removein512)
SEND_SIGNAL(helicopter, COMSIG_COMPONENT_REMOVING, C)
C.parent = src
if(C == AddComponent(C))
C._JoinParent()
+1 -5
View File
@@ -290,11 +290,7 @@
to_chat(user, "[reagents.total_volume] units of various reagents.")
else
to_chat(user, "Nothing.")
#if DM_VERSION > 511
#warn Remove the garbage bypass code below
#endif
var/Removein512 = SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user)
KillMeIn512(Removein512)
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user)
return distance == -1 || (get_dist(src, user) <= distance) || isobserver(user) //observers do not have a range limit