cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quirk limit now only applies to positive quirks

Browse Source
This commit is contained in:
Jordan Brown
2018-05-08 13:36:41 -04:00
committed by yogstation13-bot
parent 9f3e70929d
commit c514cf79cc
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -986,7 +986,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<center><a href='?_src_=prefs;preference=trait;task=close'>Done</a></center>"
dat += "<hr>"
dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
dat += "<center>[all_quirks.len] / [MAX_QUIRKS] max quirks<br>\
dat += "<center>[positive_quirks.len] / [MAX_QUIRKS] max positive quirks<br>\
<b>Quirk balance remaining:</b> [GetQuirkBalance()]</center><br>"
for(var/V in SSquirks.quirks)
var/datum/quirk/T = SSquirks.quirks[V]
@@ -1119,9 +1119,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
neutral_quirks -= quirk
all_quirks -= quirk
else
if(all_quirks.len >= MAX_QUIRKS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] quirks!</span>")
return
neutral_quirks += quirk
all_quirks += quirk
else
@@ -1136,8 +1133,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
negative_quirks -= quirk
all_quirks -= quirk
else if(value > 0)
if(all_quirks.len >= MAX_QUIRKS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] quirks!</span>")
if(positive_quirks.len >= MAX_QUIRKS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] positive quirks!</span>")
return
if(balance - value < 0)
to_chat(user, "<span class='warning'>You don't have enough balance to gain this quirk!</span>")
@@ -1145,9 +1142,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
positive_quirks += quirk
all_quirks += quirk
else
if(all_quirks.len >= MAX_QUIRKS)
to_chat(user, "<span class='warning'>You can't have more than [MAX_QUIRKS] quirks!</span>")
return
negative_quirks += quirk
all_quirks += quirk
SetQuirks(user)