cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/skyrat-ss13/skyrat-tg into upstream-christmas

Browse Source
This commit is contained in:
StrangeWeirdKitten
2023-12-31 09:09:28 -07:00
parent bf4996ab3a 8c68809cca
commit caedc98a30
512 changed files with 39181 additions and 27948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences/middleware/jobs.dm
+1 -1
View File
@@ -101,7 +101,7 @@
/datum/preference_middleware/jobs/get_ui_static_data(mob/user)
var/list/data = list()
// SKYRAT EDIT
if(SSplayer_ranks.is_veteran(user.client))
if(CONFIG_GET(flag/bypass_veteran_system) || SSplayer_ranks.is_veteran(user.client))
data["is_veteran"] = TRUE
// SKYRAT EDIT END
// BUBBER EDIT BEGIN
code/modules/client/preferences/middleware/quirks.dm
+2 -2
View File
@@ -62,7 +62,7 @@
//SKYRAT EDIT ADDITION
var/list/quirks = SSquirks.get_quirks()
var/datum/quirk/quirk = quirks[quirk_name]
if(initial(quirk.veteran_only) && !SSplayer_ranks.is_veteran(preferences?.parent))
if(!CONFIG_GET(flag/bypass_veteran_system) && initial(quirk.veteran_only) && !SSplayer_ranks.is_veteran(preferences?.parent))
return FALSE
//SKYRAT EDIT END
@@ -102,7 +102,7 @@
//SKYRAT EDIT ADDITION
var/list/quirks = SSquirks.get_quirks()
var/datum/quirk/quirk_datum = quirks[quirk]
if(initial(quirk_datum.veteran_only) && !SSplayer_ranks.is_veteran(preferences?.parent))
if(!CONFIG_GET(flag/bypass_veteran_system) && initial(quirk_datum.veteran_only) && !SSplayer_ranks.is_veteran(preferences?.parent))
preferences.all_quirks -= quirk
continue
//SKYRAT EDIT END