mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Fixes some bad Destroy()s (#10629)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
d5af465245
commit
5d2435611d
@@ -87,7 +87,7 @@
|
||||
/obj/item/melee/changeling/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
creator = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/melee/changeling/process() //Stolen from ninja swords.
|
||||
if(!creator || loc != creator || !creator.item_is_in_hands(src))
|
||||
|
||||
@@ -81,7 +81,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
|
||||
qdel(blood_image)
|
||||
blood_image = null
|
||||
rune_list.Remove(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/effect/rune/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -16,7 +16,7 @@ var/global/list/all_objectives = list()
|
||||
|
||||
/datum/objective/Destroy()
|
||||
all_objectives -= src
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/datum/objective/proc/check_completion()
|
||||
return completed
|
||||
|
||||
@@ -30,4 +30,4 @@
|
||||
|
||||
/obj/effect/temporary_effect/fire_blast/Destroy()
|
||||
explosion(get_turf(src), -1, 1, 2, 5, adminlog = 1)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user