Ports TG's Garbage Subsystem

This commit is contained in:
Fox McCloud
2018-03-28 20:02:39 -04:00
parent 067f5cf8e8
commit 22dc6860b3
74 changed files with 646 additions and 486 deletions
@@ -157,7 +157,7 @@
playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1)
if(do_after(user, PLACE_SPEED, target = src))
if(!D || qdeleted(D))
if(!D || QDELETED(D))
return
if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there
+1 -1
View File
@@ -485,7 +485,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
else ..()
/obj/item/throw_impact(atom/A)
if(A && !qdeleted(A))
if(A && !QDELETED(A))
var/itempush = 1
if(w_class < WEIGHT_CLASS_BULKY)
itempush = 0 // too light to push anything
@@ -132,7 +132,7 @@
/obj/item/weapon/grenade/plastic/c4/prime()
var/turf/location
if(target)
if(!qdeleted(target))
if(!QDELETED(target))
location = get_turf(target)
target.overlays -= image_overlay
else
@@ -159,7 +159,7 @@
/obj/item/weapon/grenade/plastic/x4/prime()
var/turf/location
if(target)
if(!qdeleted(target))
if(!QDELETED(target))
location = get_turf(target)
target.overlays -= image_overlay
else
@@ -193,7 +193,7 @@
/obj/item/weapon/grenade/plastic/c4_shaped/prime()
var/turf/location
if(target)
if(!qdeleted(target))
if(!QDELETED(target))
location = get_turf(target)
target.overlays -= image_overlay
else
@@ -67,7 +67,7 @@
walk_away(P,loc,rand(1,4))
spawn(rand(15,60))
if(P && isnull(P.gcDestroyed))
if(!QDELETED(P))
if(istype(P, /obj/item/weapon/grenade))
P.prime()
qdel(src)
+1 -1
View File
@@ -130,7 +130,7 @@
/obj/singularity_act()
ex_act(1)
if(src && !qdeleted(src))
if(src && !QDELETED(src))
qdel(src)
return 2
+2 -2
View File
@@ -363,7 +363,7 @@
icon_state = "crema_active"
for(var/mob/living/M in search_contents_for(/mob/living))
if(!M || !isnull(M.gcDestroyed))
if(QDELETED(M))
continue
if(M.stat!=2)
M.emote("scream")
@@ -372,7 +372,7 @@
user.create_attack_log("<font color='red'>Cremated [M.name] ([M.ckey])</font>")
log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])")
M.death(1)
if(!M || !isnull(M.gcDestroyed))
if(QDELETED(M))
continue // Re-check for mobs that delete themselves on death
M.ghostize()
qdel(M)