Cleaning up post-merge.

This commit is contained in:
Zuhayr
2016-01-22 01:05:44 +10:30
parent 79e06e5ad4
commit 1c100bf457
14 changed files with 99 additions and 920 deletions
+3 -3
View File
@@ -1324,7 +1324,7 @@ proc/admin_notice(var/message, var/rights)
return
log_and_message_admins("attempting to force mode autospawn.")
ticker.mode.process_autoantag()
ticker.mode.try_latespawn()
/datum/admins/proc/paralyze_mob(mob/living/H as mob)
set category = "Admin"
@@ -1345,9 +1345,9 @@ proc/admin_notice(var/message, var/rights)
set category = "Debug"
set name = "Set Telecrystals"
set desc = "Allows admins to change telecrystals of a user."
var/crystals
if(check_rights(R_ADMIN))
crystals = input("Amount of telecrystals for [H.ckey]", crystals) as null|num
if (!isnull(crystals))