From 66506d9049afd22f8ee438c5f791e80af6303b7f Mon Sep 17 00:00:00 2001 From: Krausus Date: Mon, 15 Jun 2015 11:03:23 -0400 Subject: [PATCH] Fixes Make Wizard and timed alerts Turns out timed alerts, which are ONLY used by Make Wizard, were broken ever since they were added... 11 months ago. Now they work, so Make Wizard works. --- code/__HELPERS/timed_alerts.dm | 2 +- code/modules/admin/verbs/one_click_antag.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/timed_alerts.dm b/code/__HELPERS/timed_alerts.dm index c7293762dd3..6e115a7d0c6 100644 --- a/code/__HELPERS/timed_alerts.dm +++ b/code/__HELPERS/timed_alerts.dm @@ -20,7 +20,7 @@ /mob/proc/timed_alert(question as text, title as text, default as text, time as num, \ choice1 as text, choice2 as text, choice3 as text) - if (client) client.timed_alert(question, title, default, time, choice1, choice2, choice3) + if (client) return client.timed_alert(question, title, default, time, choice1, choice2, choice3) return diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 80c3fef67e7..30a00193f26 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -168,7 +168,7 @@ client/proc/one_click_antag() if(candidates.len) candidates = shuffle(candidates) - for(var/mob/i in candidates) + for(var/mob/dead/observer/i in candidates) if(!i || !i.client) continue //Dont bother removing them from the list since we only grab one wizard theghost = i