cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Runtime in explosions/organs (#7930)

Browse Source
This commit is contained in:
Raeschen
2024-03-10 22:53:47 +01:00
committed by GitHub
parent a8f8c3b0ce
commit c24b3eec4b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/effects/mines.dm
View File

@@ -234,6 +234,7 @@
mineitemtype = /obj/item/weapon/mine/emp mineitemtype = /obj/item/weapon/mine/emp
/obj/effect/mine/emp/explode(var/mob/living/M) /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() var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(3, 1, src) s.set_up(3, 1, src)
s.start() s.start()

2
code/modules/organs/organ.dm
View File

@@ -400,7 +400,7 @@ var/list/organ_cache = list()
if(istype(owner)) if(istype(owner))
var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list
if(!organ_blood || !organ_blood.data["blood_DNA"]) 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(owner && vital)
if(user) if(user)