remove be_antagonist edits

This commit is contained in:
nevimer
2023-09-03 18:07:23 -04:00
parent 35e2783f47
commit 7747616a45
8 changed files with 15 additions and 31 deletions
@@ -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)
@@ -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
@@ -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)
@@ -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 */
@@ -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)")
@@ -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()
@@ -113,8 +113,6 @@ GLOBAL_LIST_EMPTY(startup_messages)
<hr>
<a class="menu_button" href='?src=[text_ref(src)];character_setup=1'>SETUP CHARACTER (<span id="character_slot">[uppertext(client.prefs.read_preference(/datum/preference/name/real_name))]</span>)</a>
<a class="menu_button" href='?src=[text_ref(src)];game_options=1'>GAME OPTIONS</a>
<a id="be_antag" class="menu_button" href='?src=[text_ref(src)];toggle_antag=1'>[client.prefs.read_preference(/datum/preference/toggle/be_antag) ? "<span class='checked'>☑</span> BE ANTAGONIST" : "<span class='unchecked'>☒</span> BE ANTAGONIST"]</a>
<hr>
<a class="menu_button" href='?src=[text_ref(src)];server_swap=1'>SWAP SERVERS</a>
"}
@@ -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 = \[ "<span class='unchecked'>☒</span> BE ANTAGONIST", "<span class='checked'>☑</span> 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) {
@@ -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,
};
*/