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
@@ -29,7 +29,7 @@
/obj/structure/mineral_door/Destroy()
density = 0
air_update_turf(1)
..()
return ..()
/obj/structure/mineral_door/Move()
var/turf/T = loc
+3 -3
View File
@@ -30,7 +30,7 @@
if(connected)
qdel(connected)
connected = null
..()
return ..()
/obj/structure/bodycontainer/on_log()
update_icon()
@@ -135,7 +135,7 @@ var/global/list/crematoriums = new/list()
/obj/structure/bodycontainer/crematorium/Destroy()
crematoriums.Remove(src)
..()
return ..()
/obj/structure/bodycontainer/crematorium/New()
connected = new/obj/structure/tray/c_tray(src)
@@ -214,7 +214,7 @@ var/global/list/crematoriums = new/list()
connected.connected = null
connected.update_icon()
connected = null
..()
return ..()
/obj/structure/tray/attack_paw(mob/user)
return src.attack_hand(user)
+2 -2
View File
@@ -22,7 +22,7 @@
/datum/song/Destroy()
instrumentObj = null
..()
return ..()
// note is a number from 1-7 for A-G
// acc is either "b", "n", or "#"
@@ -322,7 +322,7 @@
/obj/structure/piano/Destroy()
qdel(song)
song = null
..()
return ..()
/obj/structure/piano/initialize()
song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/structure/statue/Destroy()
density = 0
..()
return ..()
/obj/structure/statue/attackby(obj/item/weapon/W, mob/living/user, params)
add_fingerprint(user)
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/structure/target_stake/Destroy()
if(pinned_target)
pinned_target.nullPinnedLoc()
..()
return ..()
/obj/structure/target_stake/proc/nullPinnedTarget()
pinned_target = null
@@ -23,7 +23,7 @@
/obj/structure/transit_tube/station/Destroy()
SSobj.processing -= src
..()
return ..()
// Stations which will send the tube in the opposite direction after their stop.
/obj/structure/transit_tube/station/reverse
@@ -23,7 +23,7 @@
for(var/atom/movable/AM in contents)
AM.loc = loc
..()
return ..()
/obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/crowbar))
@@ -35,7 +35,7 @@
/obj/structure/windoor_assembly/Destroy()
density = 0
air_update_turf(1)
..()
return ..()
/obj/structure/windoor_assembly/Move()
var/turf/T = loc
+1 -1
View File
@@ -364,7 +364,7 @@
if(!disassembled)
playsound(src, "shatter", 70, 1)
update_nearby_icons()
..()
return ..()
/obj/structure/window/Move()