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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-01 19:39:04 -04:00
committed by GitHub
parent 6c09c744d6
commit e5f3ca6219
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/vore/07_traits.dm
+1 -9
View File
@@ -334,16 +334,8 @@
var/conflict = FALSE
if(pref.dirty_synth && !(instance.can_take & SYNTHETICS))
<<<<<<< HEAD
alert("The trait you've selected can only be taken by organic characters!","Error")
//pref.dirty_synth = 0 //Just to be sure //CHOMPEdit this shit broke, stop.
||||||| parent of f9e9aafd1d... Merge pull request #10756 from VOREStation/Arokha/fixes2
alert("The trait you've selected can only be taken by organic characters!","Error")
pref.dirty_synth = 0 //Just to be sure
=======
tgui_alert_async(usr, "The trait you've selected can only be taken by organic characters!", "Error")
pref.dirty_synth = 0 //Just to be sure
>>>>>>> f9e9aafd1d... Merge pull request #10756 from VOREStation/Arokha/fixes2
//pref.dirty_synth = 0 //Just to be sure //CHOMPEdit this shit broke, stop.
return TOPIC_REFRESH
if(pref.gross_meatbag && !(instance.can_take & ORGANICS))