From 818ab4d2d2b3110670d5702ef03abef6f4009239 Mon Sep 17 00:00:00 2001 From: adamsong Date: Wed, 23 Mar 2022 17:51:30 -0400 Subject: [PATCH] VV works again (#13491) * VV works again * Fix some more I missed --- code/game/atoms.dm | 2 +- code/game/objects/objs.dm | 6 +++--- code/modules/admin/view_variables/topic_list.dm | 2 +- code/modules/events/spacevine.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f857064f2f04..a0809cfca0c0 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -930,7 +930,7 @@ if(reagents) var/chosen_id - switch(alert(usr, "Choose a method.", "Add Reagents", list("Search", "Choose from a list", "I'm feeling lucky"))) + switch(alert(usr, "Choose a method.", "Add Reagents", "Search", "Choose from a list", "I'm feeling lucky")) if("Search") var/valid_id while(!valid_id) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d9372cd69b83..d0bb0cc903af 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -257,14 +257,14 @@ message_admins(span_notice("[key_name_admin(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], fire: [armor.fire], acid: [armor.acid]")) if(href_list[VV_HK_MASS_DEL_TYPE]) if(check_rights(R_DEBUG|R_SERVER)) - var/action_type = alert(usr, "Strict type ([type]) or type and all subtypes?",,list("Strict type","Type and subtypes","Cancel")) + var/action_type = alert(usr, "Strict type ([type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel") if(action_type == "Cancel" || !action_type) return - if(alert(usr, "Are you really sure you want to delete all objects of type [type]?",,list("Yes","No")) != "Yes") + if(alert(usr, "Are you really sure you want to delete all objects of type [type]?",,"Yes","No") != "Yes") return - if(alert(usr, "Second confirmation required. Delete?",,list("Yes","No")) != "Yes") + if(alert(usr, "Second confirmation required. Delete?",,"Yes","No") != "Yes") return var/O_type = type diff --git a/code/modules/admin/view_variables/topic_list.dm b/code/modules/admin/view_variables/topic_list.dm index 7fe1a9c715fe..ee04b798c7b8 100644 --- a/code/modules/admin/view_variables/topic_list.dm +++ b/code/modules/admin/view_variables/topic_list.dm @@ -9,7 +9,7 @@ mod_list(target, null, "list", "contents", target_index, autodetect_class = FALSE) if(href_list[VV_HK_LIST_REMOVE]) var/variable = target[target_index] - var/prompt = alert(usr,"Do you want to remove item number [target_index] from list?", "Confirm", list("Yes", "No")) + var/prompt = alert(usr,"Do you want to remove item number [target_index] from list?", "Confirm", "Yes", "No") if (prompt != "Yes") return target.Cut(target_index, target_index+1) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 03cdb446322a..fb1a71670d3f 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -397,7 +397,7 @@ /datum/spacevine_controller/vv_do_topic(href_list) . = ..() if(href_list[VV_HK_SPACEVINE_PURGE]) - if(alert(usr, "Are you sure you want to delete this spacevine cluster?", "Delete Vines", list("Yes", "No")) == "Yes") + if(alert(usr, "Are you sure you want to delete this spacevine cluster?", "Delete Vines", "Yes", "No") == "Yes") DeleteVines() /datum/spacevine_controller/proc/DeleteVines() //this is kill