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

Update 07_traits.dm

Browse Source
This commit is contained in:
cadyn
2021-02-27 14:58:55 -08:00
committed by GitHub
parent 9ecd032190
commit 6ccc54e3a1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,16 +89,10 @@
if(character.isSynthetic()) //Checking if we have a synth on our hands, boys. if(character.isSynthetic()) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1 pref.dirty_synth = 1
<<<<<<< HEAD
else //CHOMPEdit
pref.dirty_synth = 0 //CHOMPEdit
||||||| parent of 8b0c23c122... Merge pull request #9659 from KillianKirilenko/kk-misc4
=======
pref.gross_meatbag = 0 pref.gross_meatbag = 0
else else
pref.gross_meatbag = 1 pref.gross_meatbag = 1
pref.dirty_synth = 0 pref.dirty_synth = 0
>>>>>>> 8b0c23c122... Merge pull request #9659 from KillianKirilenko/kk-misc4
var/datum/species/S = character.species var/datum/species/S = character.species
var/SB var/SB