From ef1859b8773d5c285a629f3a9337295f4975c27a Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 22 Feb 2017 02:21:23 -0500 Subject: [PATCH 1/2] Swaps choices in pre-ghosting warning "Stay in body" is now the choice that's selected by default --- code/modules/mob/dead/observer/observer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index d84e434456d..10bd7c3884f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -169,7 +169,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else var/response var/alertmsg = "Are you -sure- you want to ghost?\n([warningmsg]. If you ghost now, you probably won't be able to rejoin the round! You can't change your mind, so choose wisely!)" - response = alert(src, alertmsg,"Are you sure you want to ghost?","Ghost","Stay in body") + response = alert(src, alertmsg,"Are you sure you want to ghost?","Stay in body","Ghost") if(response != "Ghost") return //didn't want to ghost after-all resting = 1 From 297b8e0cb8295f4c03c0962b65e7ccee792b4b13 Mon Sep 17 00:00:00 2001 From: Krausus Date: Wed, 22 Feb 2017 02:59:06 -0500 Subject: [PATCH 2/2] Swaps yes/no choices in candidate polling "No" is now the choice that's selected by default --- code/__HELPERS/game.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index c6f0e9bf1c9..5edccb012e3 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -463,7 +463,7 @@ proc/pollCandidates(Question, be_special_type, antag_age_check = 0, poll_time = G << 'sound/misc/notice2.ogg'//Alerting them to their consideration if(flashwindow) window_flash(G.client) - switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","Yes","No","Not This Round")) + switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","No","Yes","Not This Round")) if("Yes") to_chat(G, "Choice registered: Yes.") if((world.time-time_passed)>poll_time)//If more than 30 game seconds passed.