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

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-06-27 16:06:14 -07:00
committed by GitHub
parent bae5519bb6
commit 72a172464a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/vore/07_traits.dm
-5
View File
@@ -439,13 +439,8 @@
if(conflict)
tgui_alert_async(usr, "You cannot take this trait and [conflict] at the same time. Please remove that trait, or pick another trait to add.", "Error")
return TOPIC_REFRESH
<<<<<<< HEAD
if(path==/datum/trait/positive/linguist) //CHOMPEdit
pref.num_languages = 12 //CHOMPEdit
=======
instance.apply_pref(pref)
>>>>>>> a6f7e932ad... Merge pull request #13178 from Heroman3003/linguist
mylist += path
return TOPIC_REFRESH