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

Fixes banned/days remaining preferences display for non-dynamic ruleset antagonists. (#82506)

Browse Source
This commit is contained in:
AnturK
2024-04-07 12:46:01 -06:00
committed by GitHub
parent 89d9bd70cc
commit 1f1669e334
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences/middleware/antags.dm
+26 -9
View File
@@ -1,3 +1,11 @@
// Antagonists that don't have a dynamic ruleset, but do have a preference
GLOBAL_LIST_INIT(non_ruleset_antagonists, list(
ROLE_GLITCH = /datum/antagonist/bitrunning_glitch,
ROLE_FUGITIVE = /datum/antagonist/fugitive,
ROLE_LONE_OPERATIVE = /datum/antagonist/nukeop/lone,
ROLE_SENTIENCE = /datum/antagonist/sentient_creature,
))
/datum/preference_middleware/antags
action_delegations = list(
"set_antags" = PROC_REF(set_antags),
@@ -69,6 +77,12 @@
if (is_banned_from(preferences.parent.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE)))
antag_bans += serialize_antag_name(antag_flag)
for(var/antag_key in GLOB.non_ruleset_antagonists)
var/datum/antagonist/antag = GLOB.non_ruleset_antagonists[antag_key]
var/antag_flag = initial(antag.job_rank)
if(is_banned_from(preferences.parent.ckey, list(antag_flag, ROLE_SYNDICATE)))
antag_bans += serialize_antag_name(antag_flag)
return antag_bans
/datum/preference_middleware/antags/proc/get_antag_days_left()
@@ -91,6 +105,17 @@
if (days_needed > 0)
antag_days_left[serialize_antag_name(antag_flag)] = days_needed
for(var/antag_key in GLOB.non_ruleset_antagonists)
var/datum/antagonist/antag = GLOB.non_ruleset_antagonists[antag_key]
var/antag_flag = initial(antag.job_rank)
var/days_needed = preferences.parent?.get_remaining_days(
GLOB.special_roles[antag_flag]
)
if (days_needed > 0)
antag_days_left[serialize_antag_name(antag_flag)] = days_needed
return antag_days_left
/datum/preference_middleware/antags/proc/get_serialized_antags()
@@ -113,15 +138,7 @@
var/list/antag_icons = list()
/datum/asset/spritesheet/antagonists/create_spritesheets()
// Antagonists that don't have a dynamic ruleset, but do have a preference
var/static/list/non_ruleset_antagonists = list(
ROLE_GLITCH = /datum/antagonist/bitrunning_glitch,
ROLE_FUGITIVE = /datum/antagonist/fugitive,
ROLE_LONE_OPERATIVE = /datum/antagonist/nukeop/lone,
ROLE_SENTIENCE = /datum/antagonist/sentient_creature,
)
var/list/antagonists = non_ruleset_antagonists.Copy()
var/list/antagonists = GLOB.non_ruleset_antagonists.Copy()
for (var/datum/dynamic_ruleset/ruleset as anything in subtypesof(/datum/dynamic_ruleset))
var/datum/antagonist/antagonist_type = initial(ruleset.antag_datum)