From 7747616a45fbd0045edb01e003f268e95bc2dd99 Mon Sep 17 00:00:00 2001 From: nevimer Date: Sun, 3 Sep 2023 18:07:23 -0400 Subject: [PATCH] remove be_antagonist edits --- code/game/gamemodes/dynamic/dynamic_rulesets.dm | 4 ++-- .../dynamic/dynamic_rulesets_latejoin.dm | 4 ++-- .../dynamic/dynamic_rulesets_midround.dm | 4 ++-- .../code/modules/client/preferences/be_antag.dm | 4 ++-- .../modules/opposing_force/code/admin_procs.dm | 6 +++--- .../modules/title_screen/code/new_player.dm | 4 ++-- .../title_screen/code/title_screen_html.dm | 17 ----------------- .../game_preferences/skyrat/be_antag.tsx | 3 ++- 8 files changed, 15 insertions(+), 31 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index faefbbe9426..3d96c8ab0de 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -227,9 +227,9 @@ continue //SKYRAT EDIT ADDITION - if(!candidate_client.prefs?.read_preference(/datum/preference/toggle/be_antag)) +/* if(!candidate_client.prefs?.read_preference(/datum/preference/toggle/be_antag)) // BUBBER EDIT REMOVAL candidates.Remove(candidate_player) - continue + continue */ if(is_banned_from(candidate_client.ckey, BAN_ANTAGONIST)) candidates.Remove(candidate_player) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 656ed1c0c0c..e6e6fb9a8a3 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -17,9 +17,9 @@ else if (!((antag_preference || antag_flag) in P.client.prefs.be_special) || is_banned_from(P.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE))) candidates.Remove(P) // SKYRAT EDIT ADDITION - PROTECTED JOBS - else if(P.client?.prefs && !P.client.prefs.read_preference(/datum/preference/toggle/be_antag)) +/* else if(P.client?.prefs && !P.client.prefs.read_preference(/datum/preference/toggle/be_antag)) // BUBBER EDIT candidates.Remove(P) - continue + continue */ else if(is_banned_from(P.client?.ckey, BAN_ANTAGONIST)) candidates.Remove(P) continue diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 3caba1737a7..192d1eda007 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -58,9 +58,9 @@ if(is_banned_from(M.client.ckey, BAN_ANTAGONIST)) trimmed_list.Remove(M) continue - if(!M.client?.prefs?.read_preference(/datum/preference/toggle/be_antag)) +/* if(!M.client?.prefs?.read_preference(/datum/preference/toggle/be_antag)) // BUBBER EDIT trimmed_list.Remove(M) - continue + continue */ //SKYRAT EDIT END if(M.client.get_remaining_days(minimum_required_age) > 0) trimmed_list.Remove(M) diff --git a/modular_skyrat/master_files/code/modules/client/preferences/be_antag.dm b/modular_skyrat/master_files/code/modules/client/preferences/be_antag.dm index e865921bb3a..45f5961b410 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/be_antag.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/be_antag.dm @@ -1,5 +1,5 @@ -/datum/preference/toggle/be_antag +/* /datum/preference/toggle/be_antag category = PREFERENCE_CATEGORY_GAME_PREFERENCES default_value = FALSE savefile_key = "be_antag_pref" - savefile_identifier = PREFERENCE_PLAYER + savefile_identifier = PREFERENCE_PLAYER */ diff --git a/modular_skyrat/modules/opposing_force/code/admin_procs.dm b/modular_skyrat/modules/opposing_force/code/admin_procs.dm index 379a1de08cb..fab123ec47b 100644 --- a/modular_skyrat/modules/opposing_force/code/admin_procs.dm +++ b/modular_skyrat/modules/opposing_force/code/admin_procs.dm @@ -5,9 +5,9 @@ var/asked = 0 for(var/mob/living/carbon/human/human in GLOB.alive_player_list) - if(human.client?.prefs?.read_preference(/datum/preference/toggle/be_antag)) - to_chat(human, examine_block(span_greentext("The admins are looking for OPFOR players, if you're interested, sign up in the OOC tab!"))) - asked++ + // if(human.client?.prefs?.read_preference(/datum/preference/toggle/be_antag)) //BUBBER EDIT BEGIN + to_chat(human, examine_block(span_greentext("The admins are looking for OPFOR players, if you're interested, sign up in the OOC tab!"))) + asked++ // BUBBER EDIT END message_admins("[ADMIN_LOOKUP(usr)] has requested more OPFOR players! (Asked: [asked] players)") diff --git a/modular_skyrat/modules/title_screen/code/new_player.dm b/modular_skyrat/modules/title_screen/code/new_player.dm index 33e8a964695..f43349165fd 100644 --- a/modular_skyrat/modules/title_screen/code/new_player.dm +++ b/modular_skyrat/modules/title_screen/code/new_player.dm @@ -27,12 +27,12 @@ ViewManifest() return - if(href_list["toggle_antag"]) +/* if(href_list["toggle_antag"]) // BUBBER EDIT play_lobby_button_sound() var/datum/preferences/preferences = client.prefs preferences.write_preference(GLOB.preference_entries[/datum/preference/toggle/be_antag], !preferences.read_preference(/datum/preference/toggle/be_antag)) client << output(preferences.read_preference(/datum/preference/toggle/be_antag), "title_browser:toggle_antag") - return + return */ if(href_list["character_setup"]) play_lobby_button_sound() diff --git a/modular_skyrat/modules/title_screen/code/title_screen_html.dm b/modular_skyrat/modules/title_screen/code/title_screen_html.dm index 30f3f2949e2..60549d52dba 100644 --- a/modular_skyrat/modules/title_screen/code/title_screen_html.dm +++ b/modular_skyrat/modules/title_screen/code/title_screen_html.dm @@ -113,8 +113,6 @@ GLOBAL_LIST_EMPTY(startup_messages)
SETUP CHARACTER ([uppertext(client.prefs.read_preference(/datum/preference/name/real_name))]) GAME OPTIONS - [client.prefs.read_preference(/datum/preference/toggle/be_antag) ? "☑ BE ANTAGONIST" : "☒ BE ANTAGONIST"] -
SWAP SERVERS "} @@ -139,21 +137,6 @@ GLOBAL_LIST_EMPTY(startup_messages) ready_mark.innerHTML = ready_marks\[ready_int\]; } } - var antag_int = 0; - var antag_mark = document.getElementById("be_antag"); - var antag_marks = \[ "☒ BE ANTAGONIST", "☑ BE ANTAGONIST" \]; - function toggle_antag(setAntag) { - if(setAntag) { - antag_int = setAntag; - antag_mark.innerHTML = antag_marks\[antag_int\]; - } - else { - antag_int++; - if (antag_int === antag_marks.length) - antag_int = 0; - antag_mark.innerHTML = antag_marks\[antag_int\]; - } - } var character_name_slot = document.getElementById("character_slot"); function update_current_character(name) { diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/be_antag.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/be_antag.tsx index 957d3379eca..e91761903a6 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/be_antag.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/be_antag.tsx @@ -1,4 +1,4 @@ -import { CheckboxInput, FeatureToggle } from '../../base'; +/* import { CheckboxInput, FeatureToggle } from '../../base'; export const be_antag_pref: FeatureToggle = { name: 'Be antagonist', @@ -6,3 +6,4 @@ export const be_antag_pref: FeatureToggle = { description: 'Toggles whether you wish to be an antagonist or not.', component: CheckboxInput, }; + */