From afcfb135a85587bac2854d361e7bae4dd7e35113 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:26:53 -0700 Subject: [PATCH] [MIRROR] Better Block Injectors (#10155) Co-authored-by: Cameron Lennox Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/game/dna/dna2.dm | 2 ++ code/game/objects/effects/step_triggers.dm | 1 + code/game/objects/items/weapons/dna_injector.dm | 4 ++-- code/modules/projectiles/projectile/special.dm | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 3aefc12c66..220413d1ff 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -23,8 +23,10 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait) /proc/get_gene_from_trait(var/trait_path) // ALWAYS USE THIS RETURN_TYPE(/datum/gene/trait) var/G = GLOB.trait_to_dna_genes[trait_path] + #ifndef UNIT_TEST if(!G) // This SHOULD NOT HAPPEN, be sure any viruses or injectors that give trait paths are actually traitgenes. stack_trace("[trait_path] was used as a traitgene, without being flagged as one.") + #endif return G /datum/dna diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index a9ed13cd50..142cd15e03 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -340,6 +340,7 @@ But for now, for what it's been used for, it works. H.dna.SetSEState(gene.block,0) domutcheck(H,null,MUTCHK_FORCED) H.UpdateAppearance() + H.update_mutations() if(H.species.name == SPECIES_VOX || SPECIES_ZADDAT) //Species that 'actually' require survival gear to live. The rest don't. H.species.equip_survival_gear(H) H.equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(H), slot_w_uniform) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 9f79c86d76..00487c1925 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -325,7 +325,6 @@ trait_path = /datum/trait/positive/superpower_remoteview /obj/item/dnainjector/set_trait/remoteview/disable disabling = TRUE - /obj/item/dnainjector/set_trait/flashproof // flashproof trait_path = /datum/trait/positive/superpower_flashproof /obj/item/dnainjector/set_trait/flashproof/disable @@ -345,8 +344,9 @@ trait_path = /datum/trait/positive/superpower_remotetalk /obj/item/dnainjector/set_trait/remotetalk/disable disabling = TRUE - +// CHOMPEnable Start /obj/item/dnainjector/set_trait/nonconduct // shock trait_path = /datum/trait/positive/nonconductive_plus /obj/item/dnainjector/set_trait/nonconduct/disable disabling = TRUE +// CHOMPEnable End diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 10afbca44e..7168266b15 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -173,7 +173,7 @@ else randmutg(M) domutcheck(M,null) - H.UpdateAppearance() + M.UpdateAppearance() else M.adjustFireLoss(rand(5,15)) M.show_message(span_red("The radiation beam singes you!"))