mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 05:07:51 +01:00
More and more Destroy() cleanups all across the board - Return qdel hints.
This commit is contained in:
@@ -59,7 +59,7 @@
|
||||
|
||||
/mob/living/silicon/ai/Destroy()
|
||||
destroy_eyeobj()
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/atom/proc/move_camera_by_click()
|
||||
if(istype(usr, /mob/living/silicon/ai))
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
/obj/machinery/camera/Destroy()
|
||||
clear_all_networks()
|
||||
cameranet.cameras -= src
|
||||
..()
|
||||
return ..()
|
||||
|
||||
// Mobs
|
||||
/mob/living/silicon/ai/rejuvenate()
|
||||
|
||||
@@ -38,7 +38,11 @@ mob/observer/eye/Destroy()
|
||||
qdel(ghostimage)
|
||||
ghostimage = null
|
||||
updateallghostimages()
|
||||
..()
|
||||
if(owner)
|
||||
if(owner.eyeobj == src)
|
||||
owner.eyeobj = null
|
||||
owner = null
|
||||
. = ..()
|
||||
|
||||
/mob/observer/eye/Move(n, direct)
|
||||
if(owner == src)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
/mob/living/Destroy()
|
||||
cultnet.updateVisibility(src, 0)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/mob/living/rejuvenate()
|
||||
var/was_dead = stat == DEAD
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
/turf/simulated/Destroy()
|
||||
updateVisibility(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/turf/simulated/New()
|
||||
..()
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
/obj/structure/Destroy()
|
||||
updateVisibility(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/structure/New()
|
||||
..()
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
/datum/visualnet/Destroy()
|
||||
visual_nets -= src
|
||||
..()
|
||||
return ..()
|
||||
|
||||
// Checks if a chunk has been Generated in x, y, z.
|
||||
/datum/visualnet/proc/chunkGenerated(x, y, z)
|
||||
|
||||
@@ -27,7 +27,7 @@ var/list/holder_mob_icon_cache = list()
|
||||
|
||||
/obj/item/weapon/holder/Destroy()
|
||||
processing_objects.Remove(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/holder/process()
|
||||
update_state()
|
||||
|
||||
@@ -215,20 +215,15 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
|
||||
/mob/living/silicon/ai/Destroy()
|
||||
ai_list -= src
|
||||
|
||||
qdel(eyeobj)
|
||||
eyeobj = null
|
||||
|
||||
qdel(psupply)
|
||||
psupply = null
|
||||
|
||||
qdel(aiMulti)
|
||||
aiMulti = null
|
||||
|
||||
qdel(aiRadio)
|
||||
aiRadio = null
|
||||
|
||||
qdel(aiCamera)
|
||||
aiCamera = null
|
||||
qdel_null(announcement)
|
||||
qdel_null(eyeobj)
|
||||
qdel_null(psupply)
|
||||
qdel_null(aiPDA)
|
||||
qdel_null(aiCommunicator)
|
||||
qdel_null(aiMulti)
|
||||
qdel_null(aiRadio)
|
||||
qdel_null(aiCamera)
|
||||
hack = null
|
||||
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
silicon_mob_list -= src
|
||||
for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
|
||||
AH.unregister_alarm(src)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/mob/living/silicon/proc/init_id()
|
||||
if(idcard)
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
friends.Cut() //This one is not
|
||||
walk_list.Cut()
|
||||
languages.Cut()
|
||||
..()
|
||||
return ..()
|
||||
|
||||
//Client attached
|
||||
/mob/living/simple_animal/Login()
|
||||
|
||||
@@ -393,9 +393,6 @@
|
||||
/obj/item/weapon/grab/proc/size_difference(mob/A, mob/B)
|
||||
return mob_size_difference(A.mob_size, B.mob_size)
|
||||
|
||||
/obj/item/weapon/grab
|
||||
var/destroying = 0
|
||||
|
||||
/obj/item/weapon/grab/Destroy()
|
||||
animate(affecting, pixel_x = 0, pixel_y = 0, 4, 1, LINEAR_EASING)
|
||||
affecting.layer = 4
|
||||
@@ -408,5 +405,4 @@
|
||||
assailant = null
|
||||
qdel(hud)
|
||||
hud = null
|
||||
destroying = 1 // stops us calling qdel(src) on dropped()
|
||||
..()
|
||||
return ..()
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
/mob/living/Destroy()
|
||||
remove_all_modifiers(TRUE)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
// Called by Life().
|
||||
/mob/living/proc/handle_modifiers()
|
||||
|
||||
Reference in New Issue
Block a user