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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences/middleware/antags.dm
+4 -3
View File
@@ -149,11 +149,12 @@ GLOBAL_LIST_INIT(non_ruleset_antagonists, list(
for (var/datum/dynamic_ruleset/ruleset as anything in subtypesof(/datum/dynamic_ruleset))
var/datum/antagonist/antagonist_type = initial(ruleset.preview_antag_datum)
var/antag_flag = initial(ruleset.pref_flag)
if (isnull(antagonist_type) || isnull(antag_flag))
if(isnull(antagonist_type) || isnull(antag_flag))
continue
// antag_flag is guaranteed to be unique by unit tests.
antagonists[initial(ruleset.pref_flag)] = antagonist_type
// antag_flag is guaranteed to be unique for all non-RULESET_VARIATION rulesets
// the ||= covers specifically those rulesets - prefer the first one over variations
antagonists[initial(ruleset.pref_flag)] ||= antagonist_type
var/list/generated_icons = list()