Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE

Makes all Destroy() procs return properly
This commit is contained in:
Razharas
2015-09-01 15:54:18 +03:00
169 changed files with 217 additions and 214 deletions
+1 -1
View File
@@ -186,7 +186,7 @@
for (var/obj/structure/alien/weeds/W in range(1,T))
W.updateWeedOverlays()
linked_node = null
..()
return ..()
/obj/structure/alien/weeds/proc/Life()
set background = BACKGROUND_ENABLED
+1 -1
View File
@@ -17,7 +17,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
/obj/effect/bump_teleporter/Destroy()
BUMP_TELEPORTERS -= src
..()
return ..()
/obj/effect/bump_teleporter/Bumped(atom/user)
if(!ismob(user))
@@ -17,7 +17,7 @@
for(var/datum/disease/D in viruses)
D.cure(0)
viruses = null
..()
return ..()
/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions)
spawn (0)
@@ -15,7 +15,7 @@
for(var/datum/disease/D in viruses)
D.cure(0)
viruses = null
..()
return ..()
/obj/effect/decal/cleanable/blood/New()
..()
@@ -114,7 +114,7 @@
for(var/datum/disease/D in viruses)
D.cure(0)
viruses = null
..()
return ..()
/obj/effect/decal/cleanable/tomato_smudge
name = "tomato smudge"
@@ -59,7 +59,7 @@
for(var/datum/disease/D in viruses)
D.cure(0)
viruses = null
..()
return ..()
/obj/effect/decal/cleanable/oil/streak
random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
+1 -1
View File
@@ -56,4 +56,4 @@
gang.territory -= territory.type
gang.territory_new -= territory.type
gang.territory_lost |= list(territory.type = territory.name)
..()
return ..()
@@ -194,7 +194,7 @@
/obj/structure/foamedmetal/Destroy()
density = 0
air_update_turf(1)
..()
return ..()
/obj/structure/foamedmetal/Move()
@@ -36,7 +36,7 @@
/obj/effect/effect/smoke/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/effect/effect/smoke/proc/kill_smoke()
SSobj.processing.Remove(src)
@@ -192,8 +192,7 @@
/datum/effect/effect/system/smoke_spread/chem/Destroy()
chemholder = null
..()
return QDEL_HINT_PUTINPOOL
return ..()
/datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0)
if(n > 20)
+1 -1
View File
@@ -255,4 +255,4 @@
src.visible_message("<span class='warning'>\The [src] splits open.</span>")
for(var/atom/movable/A in contents)
A.loc = src.loc
..()
return ..()