cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11875 from Heroman3003/synthtrait

Browse Source 
Fixes bugs related to organic/synthetic exclusive traits disappearing
This commit is contained in:
Casey
2021-11-22 23:19:44 -05:00
committed by Chompstation Bot
parent e6f330182b
commit b2348a672b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -75,6 +75,13 @@
pref.starting_trait_points = STARTING_SPECIES_POINTS pref.starting_trait_points = STARTING_SPECIES_POINTS
pref.max_traits = MAX_SPECIES_TRAITS pref.max_traits = MAX_SPECIES_TRAITS
if(pref.organ_data[O_BRAIN]) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1
pref.gross_meatbag = 0
else
pref.gross_meatbag = 1
pref.dirty_synth = 0
if(pref.species != SPECIES_CUSTOM) if(pref.species != SPECIES_CUSTOM)
pref.pos_traits.Cut() pref.pos_traits.Cut()
pref.neg_traits.Cut() pref.neg_traits.Cut()
@@ -105,7 +112,7 @@
var/take_flags = initial(path.can_take) var/take_flags = initial(path.can_take)
if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS))) if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS)))
pref.neg_traits -= path pref.neg_traits -= path
var/datum/species/selected_species = GLOB.all_species[pref.species] var/datum/species/selected_species = GLOB.all_species[pref.species]
if(selected_species.selects_bodytype) if(selected_species.selects_bodytype)
// Allowed! // Allowed!