Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087

[MIRROR] Cleans up some qdel(src)'s in Initialize()
This commit is contained in:
deathride58
2017-11-27 02:37:07 +00:00
committed by GitHub
14 changed files with 59 additions and 60 deletions
+1 -1
View File
@@ -136,7 +136,7 @@
if(!good_chisel_message_location(T))
persists = FALSE
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/structure/chisel_message/proc/register(mob/user, newmessage)
hidden_message = newmessage
+2 -2
View File
@@ -15,7 +15,7 @@
for(var/turf/T in get_area_turfs(thearea, z))
if(T.baseturf != T.type) //Don't break indestructible walls and the like
T.baseturf = baseturf
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/effect/baseturf_helper/asteroid
@@ -65,5 +65,5 @@ GLOBAL_LIST_EMPTY(z_is_planet)
var/turf/T = get_turf(src)
if(!turf_z_is_planet(T))
GLOB.z_is_planet["[T.z]"] = list()
qdel(src)
return INITIALIZE_HINT_QDEL
+1 -1
View File
@@ -18,7 +18,7 @@
if (machine)
machine.CONSOLE = src
else
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/machinery/mineral/processing_unit_console/attack_hand(mob/user)
@@ -710,7 +710,7 @@
to_chat(cloth_golem, "<span class='notice'>You start gathering your life energy, preparing to rise again...</span>")
addtimer(CALLBACK(src, .proc/revive), revive_time)
else
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/structure/cloth_pile/Destroy()
if(cloth_golem)
+1 -2
View File
@@ -88,8 +88,7 @@
. = ..()
if(!target_ai) //If there is no player/brain inside.
new/obj/structure/AIcore/deactivated(loc) //New empty terminal.
qdel(src)//Delete AI.
return
return INITIALIZE_HINT_QDEL //Delete AI.
if(L && istype(L, /datum/ai_laws))
laws = L
@@ -800,7 +800,7 @@ Pass a positive integer as an argument to override a bot's default speed.
. = ..()
owner = loc
if(!istype(owner))
qdel(src)
return INITIALIZE_HINT_QDEL
/mob/living/simple_animal/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired.
if(!user.canUseTopic(src))
@@ -310,7 +310,7 @@
P.gender = MALE
P.desc = "It's the HoP's beloved corgi puppy."
Write_Memory(FALSE)
qdel(src)
return INITIALIZE_HINT_QDEL
else if(age == record_age)
icon_state = "old_corgi"
icon_living = "old_corgi"