cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix

Browse Source 
Conflicts:
	code/modules/mob/living/silicon/robot/life.dm
This commit is contained in:
Tastyfish
2015-11-30 21:54:22 -05:00
parent b2abdd34c1 6ed7724946
commit 897313844b
14 changed files with 344 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+2 -2
View File
@@ -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 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)