From 802ab71c0295ab3b7d3986146759399188da56e1 Mon Sep 17 00:00:00 2001 From: Adrer Date: Tue, 14 Nov 2023 14:02:19 +0100 Subject: [PATCH] Adds a confirmation prompt to all OOC events in the secrets panel. (#22959) * Secret confirmation prompt * Update code/modules/admin/topic.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Added confirmation promts * Requested change --------- Co-authored-by: adrermail@gmail.com Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --- code/modules/admin/topic.dm | 51 +++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 1bc9895b417..e626269dd5e 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2800,27 +2800,35 @@ qdel(query_memoedits) else if(href_list["secretsfun"]) - if(!check_rights(R_SERVER|R_EVENT)) return - + if(!check_rights(R_SERVER|R_EVENT)) + return var/ok = 0 switch(href_list["secretsfun"]) if("sec_clothes") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Remove 'internal' clothing") for(var/obj/item/clothing/under/O in world) qdel(O) ok = 1 if("sec_all_clothes") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Remove ALL clothing") for(var/obj/item/clothing/O in world) qdel(O) ok = 1 if("sec_classic1") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Remove firesuits, grilles, and pods") for(var/obj/item/clothing/suit/fire/O in world) qdel(O) for(var/obj/structure/grille/O in world) qdel(O) if("monkey") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Monkeyize All Humans") for(var/thing in GLOB.human_list) var/mob/living/carbon/human/H = thing @@ -2828,6 +2836,8 @@ H.monkeyize() ok = 1 if("corgi") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Corgize All Humans") for(var/thing in GLOB.human_list) var/mob/living/carbon/human/H = thing @@ -2897,6 +2907,8 @@ if(!SSticker) alert("The game hasn't started yet!", null, null, null, null, null) return + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Prison Warp") message_admins("[key_name_admin(usr)] teleported all players to the prison station.", 1) for(var/thing in GLOB.human_list) @@ -2936,6 +2948,8 @@ if(!SSticker) alert("The game hasn't started yet!") return + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return var/objective = sanitize(copytext(input("Enter an objective"),1,MAX_MESSAGE_LEN)) if(!objective) return @@ -3015,33 +3029,34 @@ L.fix() L.switchcount = 0 if("floorlava") - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Lava Floor") - var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") - if(sure == "No") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") return + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Lava Floor") SSweather.run_weather(/datum/weather/floor_is_lava) message_admins("[key_name_admin(usr)] made the floor lava") if("fakelava") - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Lava Floor Fake") - var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") - if(sure == "No") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") return + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Lava Floor Fake") SSweather.run_weather(/datum/weather/floor_is_lava/fake) message_admins("[key_name_admin(usr)] made aesthetic lava on the floor") if("weatherashstorm") - SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Weather Ash Storm") - var/sure = alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") - if(sure == "No") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") return + SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Weather Ash Storm") SSweather.run_weather(/datum/weather/ash_storm) message_admins("[key_name_admin(usr)] spawned an ash storm on the mining level") if("stupify") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Mass Braindamage") for(var/mob/living/carbon/human/H in GLOB.player_list) to_chat(H, "You suddenly feel stupid.") H.setBrainLoss(60) message_admins("[key_name_admin(usr)] made everybody stupid") if("fakeguns") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Fake Guns") for(var/obj/item/W in world) if(isclothing(W) || istype(W, /obj/item/card/id) || istype(W, /obj/item/disk) || istype(W, /obj/item/tank)) @@ -3051,6 +3066,8 @@ W.item_state = "gun" message_admins("[key_name_admin(usr)] made every item look like a gun") if("schoolgirl") // nyaa~ How much are you paying attention in reviews? + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Chinese Cartoons") for(var/obj/item/clothing/under/W in world) W.icon_state = "schoolgirl" @@ -3059,6 +3076,8 @@ message_admins("[key_name_admin(usr)] activated Japanese Animes mode") SEND_SOUND(world, sound('sound/AI/animes.ogg')) if("eagles")//SCRAW + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Egalitarian Station") for(var/obj/machinery/door/airlock/W in GLOB.airlocks) if(is_station_level(W.z) && !istype(get_area(W), /area/station/command/bridge) && !istype(get_area(W), /area/station/public) && !istype(get_area(W), /area/station/security/prison)) @@ -3066,13 +3085,19 @@ message_admins("[key_name_admin(usr)] activated Egalitarian Station mode") GLOB.minor_announcement.Announce("Centcomm airlock control override activated. Please take this time to get acquainted with your coworkers.", new_sound = 'sound/AI/commandreport.ogg') if("onlyone") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Only One") usr.client.only_one() // message_admins("[key_name_admin(usr)] has triggered HIGHLANDER") if("onlyme") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Only Me") usr.client.only_me() if("onlyoneteam") + if(alert(usr, "Are you sure you want to do this?", "Confirmation", "Yes", "No") != "Yes") + return SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Only One Team") usr.client.only_one_team() // message_admins("[key_name_admin(usr)] has triggered ") @@ -3157,8 +3182,8 @@ to_chat(world, "A secret has been activated by [usr.key]!") else if(href_list["secretsadmin"]) - if(!check_rights(R_ADMIN)) return - + if(!check_rights(R_ADMIN)) + return var/ok = 0 switch(href_list["secretsadmin"]) if("list_signalers")