cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11281 from mwerezak/autoantag

Browse Source 
Cleans up antag auto-spawning, adds checks for active antags
This commit is contained in:
Chinsky
2015-10-15 19:16:13 +03:00
parent d75a146cc3 ffb26a6f87
commit 0c474bc5a5
9 changed files with 92 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/admin/admin.dm
View File

@@ -1386,7 +1386,7 @@ proc/admin_notice(var/message, var/rights)
var/datum/antagonist/antag = all_antag_types[antag_type]
message_admins("[key_name(usr)] attempting to force latespawn with template [antag.id].")
antag.attempt_late_spawn()
antag.attempt_auto_spawn()
/datum/admins/proc/force_mode_latespawn()
set category = "Admin"
@@ -1403,6 +1403,5 @@ proc/admin_notice(var/message, var/rights)
usr << "Mode has not started."
return
message_admins("[key_name(usr)] attempting to force mode latespawn.")
ticker.mode.next_spawn = 0
ticker.mode.try_latespawn()
message_admins("[key_name(usr)] attempting to force mode autospawn.")
ticker.mode.process_autoantag()