From 6de814a3dbfcce504f3ae0892066744def8700ef Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Sun, 6 Nov 2022 03:16:56 +0100 Subject: [PATCH] fixes cursed katana not spawning (#71065) --- code/modules/mining/lavaland/tendril_loot.dm | 5 +++-- code/modules/surgery/organs/_organ.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 874202a222a..1e444161a72 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -923,7 +923,7 @@ ATTACK_CUT = list(COMBO_STEPS = list(RIGHT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/cut), ATTACK_CLOAK = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/cloak), ATTACK_SHATTER = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/shatter), - ) + ) /obj/item/cursed_katana/Initialize(mapload) . = ..() @@ -1045,7 +1045,8 @@ playsound(src, 'sound/magic/smoke.ogg', 50, TRUE) if(ishostile(target)) var/mob/living/simple_animal/hostile/hostile_target = target - hostile_target.LoseTarget() + if(hostile_target.target == user) + hostile_target.LoseTarget() addtimer(CALLBACK(src, .proc/uncloak, user), 5 SECONDS, TIMER_UNIQUE) /obj/item/cursed_katana/proc/uncloak(mob/user) diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index 28a9fc6b0cd..049e6b269be 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -61,7 +61,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /obj/item/organ/forceMove(atom/destination, check_dest = TRUE) if(check_dest && destination) //Nullspace is always a valid location for organs. Because reasons. - if(organ_flags & ORGAN_UNREMOVABLE) //If this organ is unremovable, it should delete itself if it tries to be moved to anything besides a bodypart. + if(organ_flags & ORGAN_UNREMOVABLE && owner) //If this organ is unremovable, it should delete itself if it tries to be moved to anything besides a bodypart. if(!isbodypart(destination) && !iscarbon(destination)) qdel(src) return //Don't move it out of nullspace if it's deleted.