From 8b39fa3bb1d64644211f0254b43c66c5ddf87e99 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 30 Nov 2015 01:25:12 -0500 Subject: [PATCH 1/2] Fixes custom enemy communications --- code/modules/admin/verbs/randomverbs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 61a4ac39c68..e111740e287 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -537,11 +537,11 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/cmd_admin_create_centcom_report() set category = "Event" set name = "Create Communications Report" - + var/list/MsgType = list("Centcom Report","Enemy Communications") if(!check_rights(R_SERVER|R_EVENT)) return - var/type = input(usr, "Pick a type of report to send", "Report Type", "") in list("Centcom Report","Enemy Communications") + var/type = input(usr, "Pick a type of report to send", "Report Type", "") as null|anything in MsgType var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null var/customname = input(usr, "Pick a title for the report.", "Title") as text|null if(!input) From 2f28c537c467f31ff06478b953850932d6e8dad6 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 30 Nov 2015 07:46:06 -0500 Subject: [PATCH 2/2] Removes Null --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e111740e287..b9a8991e5af 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -541,7 +541,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_SERVER|R_EVENT)) return - var/type = input(usr, "Pick a type of report to send", "Report Type", "") as null|anything in MsgType + var/type = input(usr, "Pick a type of report to send", "Report Type", "") as anything in MsgType var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null var/customname = input(usr, "Pick a title for the report.", "Title") as text|null if(!input)