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

Merge pull request #6731 from Citadel-Station-13/upstream-merge-37749

Browse Source 
[MIRROR] Quirk limit now only applies to positive quirks
This commit is contained in:
LetterJay
2018-05-15 06:51:39 -05:00
committed by GitHub
parent 19306a2d9b 7c3c270e2a
commit 691cc34ebf
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+3 -9
View File
@@ -876,7 +876,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]
@@ -990,9 +990,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
@@ -1007,8 +1004,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>")
@@ -1016,9 +1013,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)