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

[MIRROR-FIX] Upstream merge 15464 (#7176)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
Selis
2023-11-07 13:33:44 +01:00
committed by GitHub
parent 58d26cc799
commit 2ba38d60af
40 changed files with 272 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,6 +120,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
var/custom_exclaim
var/list/custom_heat = list()
var/list/custom_cold = list()
var/digitigrade = 0 //0, Not FALSE, for future use as indicator for digitigrade types
// VOREStation
// New stuff
@@ -148,6 +149,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
new_dna.custom_exclaim=custom_exclaim //VOREStaton Edit
new_dna.custom_heat=custom_heat //VOREStation Edit
new_dna.custom_cold=custom_cold //VOREStation Edit
new_dna.digitigrade=src.digitigrade //VOREStation Edit
var/list/body_markings_genetic = (body_markings - body_marking_nopersist_list)
new_dna.body_markings=body_markings_genetic.Copy()
for(var/b=1;b<=DNA_SE_LENGTH;b++)
@@ -222,6 +224,7 @@ var/global/list/datum/dna/gene/dna_genes[0]
src.custom_exclaim = character.custom_exclaim
src.custom_heat = character.custom_heat
src.custom_cold = character.custom_cold
src.digitigrade = character.digitigrade
// +1 to account for the none-of-the-above possibility
SetUIValueRange(DNA_UI_EAR_STYLE, ear_style + 1, ear_styles_list.len + 1, 1)