mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Better Block Injectors (#10155)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
f61f843f8b
commit
afcfb135a8
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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!"))
|
||||
|
||||
Reference in New Issue
Block a user