cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-06-22 18:20:29 -04:00
committed by GitHub
parent c6b41d7658
commit f7edb1694e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/species/station/teshari.dm
View File

@@ -64,11 +64,7 @@
ambiguous_genders = TRUE ambiguous_genders = TRUE
<<<<<<< HEAD
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_NO_POSIBRAIN //CHOMPedit: This is overriden by teshari_vr.dm. Noting here for future reference.
=======
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
>>>>>>> a423e9e3a0... Merge pull request #13086 from VOREStation/upstream-merge-8649
appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR
bump_flag = MONKEY bump_flag = MONKEY
swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL