mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
This commit is contained in:
committed by
Chompstation Bot
parent
ad149bb509
commit
bc6564deb6
@@ -111,6 +111,9 @@ GLOBAL_LIST_EMPTY(mannequins)
|
||||
M = GLOB.mannequins[ckey]
|
||||
return M
|
||||
|
||||
/proc/del_mannequin(var/ckey = "NULL")
|
||||
GLOB.mannequins-= ckey
|
||||
|
||||
//////////////////////////
|
||||
/////Initial Building/////
|
||||
//////////////////////////
|
||||
|
||||
@@ -266,7 +266,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
|
||||
. = ..()
|
||||
if(exonet)
|
||||
exonet.remove_address()
|
||||
exonet = null
|
||||
qdel_null(exonet)
|
||||
return ..()
|
||||
|
||||
// Proc: register_device()
|
||||
|
||||
@@ -119,6 +119,9 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/weapon/implant/tracking
|
||||
|
||||
/obj/item/weapon/implant/tracking/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
if(part)
|
||||
part.implants -= src
|
||||
part = imp_in = null
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/implant/tracking/process()
|
||||
|
||||
@@ -41,13 +41,18 @@
|
||||
/obj/item/weapon/storage/Destroy()
|
||||
close_all()
|
||||
QDEL_NULL(boxes)
|
||||
QDEL_NULL(src.storage_start)
|
||||
QDEL_NULL(src.storage_continue)
|
||||
QDEL_NULL(src.storage_end)
|
||||
QDEL_NULL(src.stored_start)
|
||||
QDEL_NULL(src.stored_continue)
|
||||
QDEL_NULL(src.stored_end)
|
||||
QDEL_NULL(storage_start)
|
||||
QDEL_NULL(storage_continue)
|
||||
QDEL_NULL(storage_end)
|
||||
QDEL_NULL(stored_start)
|
||||
QDEL_NULL(stored_continue)
|
||||
QDEL_NULL(stored_end)
|
||||
QDEL_NULL(closer)
|
||||
|
||||
if(ismob(loc))
|
||||
var/mob/M = loc
|
||||
M.remove_from_mob(src)
|
||||
|
||||
. = ..()
|
||||
|
||||
/obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
|
||||
|
||||
@@ -42,6 +42,8 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image
|
||||
sight |= SEE_TURFS
|
||||
player_list |= src
|
||||
|
||||
created_for = ckey
|
||||
|
||||
new_player_panel()
|
||||
spawn(40)
|
||||
if(client)
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
my_client = null
|
||||
|
||||
..()
|
||||
|
||||
if(created_for)
|
||||
del_mannequin(created_for)
|
||||
|
||||
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
|
||||
key = null//We null their key before deleting the mob, so they are properly kicked out.
|
||||
qdel(src)
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
anchored = 1 // don't get pushed around
|
||||
|
||||
var/created_for
|
||||
|
||||
/mob/new_player/New()
|
||||
mob_list += src
|
||||
initialized = TRUE // Explicitly don't use Initialize(). New players join super early and use New()
|
||||
|
||||
@@ -106,7 +106,12 @@
|
||||
while(null in owner.organs)
|
||||
owner.organs -= null
|
||||
|
||||
implants.Cut() //VOREStation Add - Remove these too!
|
||||
for(var/imp in implants)
|
||||
var/obj/item/weapon/implant/I = imp
|
||||
if(!istype(I))
|
||||
continue
|
||||
I.imp_in = I.part = null
|
||||
implants.Cut()
|
||||
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user