From c24b3eec4b2d897d755b248f53f20bad3d8fbb35 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Sun, 10 Mar 2024 22:53:47 +0100 Subject: [PATCH] Runtime in explosions/organs (#7930) --- code/game/objects/effects/mines.dm | 1 + code/modules/organs/organ.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 553851dd4c..417c584d4d 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -234,6 +234,7 @@ mineitemtype = /obj/item/weapon/mine/emp /obj/effect/mine/emp/explode(var/mob/living/M) + triggered = 1 //ChompEDIT recursing mines var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(3, 1, src) s.start() diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 9cdb19a4fb..94ed74a453 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -400,7 +400,7 @@ var/list/organ_cache = list() if(istype(owner)) var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list if(!organ_blood || !organ_blood.data["blood_DNA"]) - owner.vessel.trans_to(src, 5, 1, 1) + owner.vessel?.trans_to(src, 5, 1, 1) if(owner && vital) if(user)