mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] Adds Trait Genetics (#10142)
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
d81e145924
commit
7bfffc808d
@@ -993,7 +993,7 @@
|
||||
// *******************************************************
|
||||
/datum/tgui_module/appearance_changer/cocoon
|
||||
name ="Appearance Editor (Cocoon)"
|
||||
flags = APPEARANCE_ALL_HAIR
|
||||
flags = APPEARANCE_ALL_HAIR | APPEARANCE_EYE_COLOR | APPEARANCE_SKIN
|
||||
customize_usr = TRUE
|
||||
|
||||
/datum/tgui_module/appearance_changer/cocoon/tgui_status(mob/user, datum/tgui_state/state)
|
||||
@@ -1002,6 +1002,20 @@
|
||||
return STATUS_CLOSE
|
||||
return ..()
|
||||
|
||||
// *******************************************************
|
||||
// Morph Superpower
|
||||
// *******************************************************
|
||||
/datum/tgui_module/appearance_changer/superpower
|
||||
name ="Appearance Editor (Superpower)"
|
||||
flags = APPEARANCE_ALL_HAIR | APPEARANCE_EYE_COLOR | APPEARANCE_SKIN
|
||||
customize_usr = TRUE
|
||||
|
||||
/datum/tgui_module/appearance_changer/superpower/tgui_status(mob/user, datum/tgui_state/state)
|
||||
var/datum/gene/G = get_gene_from_trait(/datum/trait/positive/superpower_morph)
|
||||
if(!owner.dna.GetSEState(G.block))
|
||||
return STATUS_CLOSE
|
||||
return ..()
|
||||
|
||||
// *******************************************************
|
||||
// Body design console
|
||||
// *******************************************************
|
||||
@@ -1079,8 +1093,9 @@
|
||||
owner.dna.digitigrade = R.dna.digitigrade // ensure cloned DNA is set appropriately from record??? for some reason it doesn't get set right despite the override to datum/dna/Clone()
|
||||
//Update appearance, remake icons
|
||||
owner.UpdateAppearance()
|
||||
//owner.sync_dna_traits(FALSE) //Needs trait genetics first
|
||||
owner.sync_dna_traits(FALSE)
|
||||
owner.sync_organ_dna()
|
||||
owner.initialize_vessel()
|
||||
owner.dna.blood_reagents = R.dna.blood_reagents
|
||||
owner.dna.blood_color = R.dna.blood_color
|
||||
owner.regenerate_icons()
|
||||
|
||||
Reference in New Issue
Block a user