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

[MIRROR] Better Block Injectors (#10155)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-13 17:26:53 -07:00
committed by GitHub
parent f61f843f8b
commit afcfb135a8
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/dna/dna2.dm
View File

@@ -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 /proc/get_gene_from_trait(var/trait_path) // ALWAYS USE THIS
RETURN_TYPE(/datum/gene/trait) RETURN_TYPE(/datum/gene/trait)
var/G = GLOB.trait_to_dna_genes[trait_path] 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. 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.") stack_trace("[trait_path] was used as a traitgene, without being flagged as one.")
#endif
return G return G
/datum/dna /datum/dna

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

@@ -340,6 +340,7 @@ But for now, for what it's been used for, it works.
H.dna.SetSEState(gene.block,0) H.dna.SetSEState(gene.block,0)
domutcheck(H,null,MUTCHK_FORCED) domutcheck(H,null,MUTCHK_FORCED)
H.UpdateAppearance() 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. 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.species.equip_survival_gear(H)
H.equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(H), slot_w_uniform)

4
code/game/objects/items/weapons/dna_injector.dm
View File

@@ -325,7 +325,6 @@
trait_path = /datum/trait/positive/superpower_remoteview trait_path = /datum/trait/positive/superpower_remoteview
/obj/item/dnainjector/set_trait/remoteview/disable /obj/item/dnainjector/set_trait/remoteview/disable
disabling = TRUE disabling = TRUE
/obj/item/dnainjector/set_trait/flashproof // flashproof /obj/item/dnainjector/set_trait/flashproof // flashproof
trait_path = /datum/trait/positive/superpower_flashproof trait_path = /datum/trait/positive/superpower_flashproof
/obj/item/dnainjector/set_trait/flashproof/disable /obj/item/dnainjector/set_trait/flashproof/disable
@@ -345,8 +344,9 @@
trait_path = /datum/trait/positive/superpower_remotetalk trait_path = /datum/trait/positive/superpower_remotetalk
/obj/item/dnainjector/set_trait/remotetalk/disable /obj/item/dnainjector/set_trait/remotetalk/disable
disabling = TRUE disabling = TRUE
// CHOMPEnable Start
/obj/item/dnainjector/set_trait/nonconduct // shock /obj/item/dnainjector/set_trait/nonconduct // shock
trait_path = /datum/trait/positive/nonconductive_plus trait_path = /datum/trait/positive/nonconductive_plus
/obj/item/dnainjector/set_trait/nonconduct/disable /obj/item/dnainjector/set_trait/nonconduct/disable
disabling = TRUE disabling = TRUE
// CHOMPEnable End

2
code/modules/projectiles/projectile/special.dm
View File

@@ -173,7 +173,7 @@
else else
randmutg(M) randmutg(M)
domutcheck(M,null) domutcheck(M,null)
H.UpdateAppearance() M.UpdateAppearance()
else else
M.adjustFireLoss(rand(5,15)) M.adjustFireLoss(rand(5,15))
M.show_message(span_red("The radiation beam singes you!")) M.show_message(span_red("The radiation beam singes you!"))