cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 04:34:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update 07_traits.dm

Browse Source
This commit is contained in:
cadyn
2021-01-24 16:16:55 -08:00
committed by GitHub
parent ed3a6fdcb1
commit b3a17b2678
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/vore/07_traits.dm
-14
View File
@@ -89,19 +89,6 @@
else //CHOMPEdit
pref.dirty_synth = 0 //CHOMPEdit
<<<<<<< HEAD
if(selected_species.selects_bodytype)
var/datum/species/custom/CS = character.species
var/S = pref.custom_base ? pref.custom_base : "Human"
var/datum/species/custom/new_CS = CS.produceCopy(S, pref.pos_traits + pref.neu_traits + pref.neg_traits, character)
||||||| parent of f74536a0b6... Merge pull request #9601 from Heroman3003/quickfixholyheckibrokeeeverything
var/datum/species/S = character.species
var/SB = pref.custom_base ? pref.custom_base : "Human"
var/datum/species/new_S = S.produceCopy(SB, pref.pos_traits + pref.neu_traits + pref.neg_traits, character)
//Any additional non-trait settings can be applied here
new_S.blood_color = pref.blood_color
=======
var/datum/species/S = character.species
var/SB
if(S.selects_bodytype)
@@ -112,7 +99,6 @@
//Any additional non-trait settings can be applied here
new_S.blood_color = pref.blood_color
>>>>>>> f74536a0b6... Merge pull request #9601 from Heroman3003/quickfixholyheckibrokeeeverything
//Any additional non-trait settings can be applied here
new_CS.blood_color = pref.blood_color