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

Makes quirk points configs get loaded into vars on the subsystem, + a small biome fix (#95941)

Browse Source
This commit is contained in:
Bloop
2026-05-03 14:23:12 -04:00
committed by GitHub
parent de059fdf57
commit e6e0200edb
5 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2 -2
View File
@@ -417,7 +417,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
return TRUE
/datum/preferences/proc/GetQuirkBalance()
var/bal = CONFIG_GET(number/default_quirk_points)
var/bal = SSquirks.default_quirk_points
for(var/V in all_quirks)
var/datum/quirk/T = SSquirks.quirks[V]
bal -= initial(T.value)
@@ -442,7 +442,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(LAZYLEN(quirks_removed))
LAZYADD(feedback, "The following quirks are incompatible with your species:")
LAZYADD(feedback, quirks_removed)
if(!CONFIG_GET(flag/disable_quirk_points) && GetQuirkBalance() < 0)
if(SSquirks.points_enabled && GetQuirkBalance() < 0)
LAZYADD(feedback, "Your quirks have been reset.")
all_quirks = list()
if(LAZYLEN(feedback))
code/modules/client/preferences/middleware/quirks.dm
+4 -4
View File
@@ -19,7 +19,7 @@
if(!LAZYLEN(incompatible_quirks))
return
var/list/message = list("The following quirks are incompatible with your selected species and will be removed: [incompatible_quirks.Join(", ")].")
if(CONFIG_GET(flag/disable_quirk_points))
if(!SSquirks.points_enabled)
message += "Would you like to continue?"
else
message += "If you do not have enough points to cover the removed quirks, your quirks will be reset. Would you like to continue?"
@@ -48,7 +48,7 @@
var/list/data = list()
data["selected_quirks"] = get_selected_quirks()
data["default_quirk_balance"] = CONFIG_GET(number/default_quirk_points)
data["default_quirk_balance"] = SSquirks.default_quirk_points
data["species_disallowed_quirks"] = get_species_compatibility()
return data
@@ -68,7 +68,7 @@
var/list/quirks = SSquirks.get_quirks()
var/max_positive_quirks = CONFIG_GET(number/max_positive_quirks)
var/max_positive_quirks = SSquirks.max_positive_quirks
var/positive_quirks_disabled = max_positive_quirks == 0
for (var/quirk_name in quirks)
var/datum/quirk/quirk = quirks[quirk_name]
@@ -91,7 +91,7 @@
"max_positive_quirks" = max_positive_quirks,
"quirk_info" = quirk_info,
"quirk_blacklist" = GLOB.quirk_string_blacklist,
"points_enabled" = !CONFIG_GET(flag/disable_quirk_points),
"points_enabled" = SSquirks.points_enabled,
)
/datum/preference_middleware/quirks/on_new_character(mob/user)