shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update preferences.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-14 09:53:00 -05:00
committed by GitHub
parent e990ac3ef7
commit 21bc6c48ef
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/client/preferences.dm
View File

@@ -986,16 +986,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
neutral_traits -= trait
all_traits -= trait
else
<<<<<<< HEAD
if(all_traits.len >= MAX_TRAITS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_TRAITS] traits!</span>")
return
neutral_traits += trait
all_traits += trait
=======
neutral_quirks += quirk
all_quirks += quirk
>>>>>>> e74f33d... Quirk limit now only applies to positive quirks
else
var/balance = GetTraitBalance()
if(trait in positive_traits)
@@ -1008,13 +1000,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
negative_traits -= trait
all_traits -= trait
else if(value > 0)
<<<<<<< HEAD
if(all_traits.len >= MAX_TRAITS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_TRAITS] traits!</span>")
=======
if(positive_quirks.len >= MAX_QUIRKS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] positive quirks!</span>")
>>>>>>> e74f33d... Quirk limit now only applies to positive quirks
return
if(balance - value < 0)
to_chat(user, "<span class='warning'>You don't have enough balance to gain this trait!</span>")
@@ -1022,18 +1009,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
positive_traits += trait
all_traits += trait
else
<<<<<<< HEAD
if(all_traits.len >= MAX_TRAITS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_TRAITS] traits!</span>")
return
negative_traits += trait
all_traits += trait
SetTraits(user)
=======
negative_quirks += quirk
all_quirks += quirk
SetQuirks(user)
>>>>>>> e74f33d... Quirk limit now only applies to positive quirks
if("reset")
all_traits = list()
positive_traits = list()