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

Merge pull request #11021 from Zuhayr/antagsystem

Browse Source 
Forgot a couple of tweaks.
This commit is contained in:
Chinsky
2015-09-06 08:06:48 +03:00
parent 3bb0e2503a eacc1e7da7
commit d99c4ffaaa
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/game_mode.dm
View File

@@ -185,6 +185,8 @@ var/global/list/additional_antag_types = list()
return return
var/datum/antagonist/antag = all_antag_types[choice] var/datum/antagonist/antag = all_antag_types[choice]
if(antag) if(antag)
if(!islist(ticker.mode.antag_templates))
ticker.mode.antag_templates = list()
ticker.mode.antag_templates |= antag ticker.mode.antag_templates |= antag
message_admins("Admin [key_name_admin(usr)] added [antag.role_text] template to game mode.") message_admins("Admin [key_name_admin(usr)] added [antag.role_text] template to game mode.")

5
code/game/gamemodes/game_mode_latespawn.dm
View File

@@ -1,6 +1,7 @@
/datum/game_mode/var/next_spawn = 0 /datum/game_mode/var/next_spawn = 0
/datum/game_mode/var/min_autotraitor_delay = 4200 // Approx 7 minutes. /datum/game_mode/var/min_autotraitor_delay = 4200 // Approx 7 minutes.
/datum/game_mode/var/max_autotraitor_delay = 12000 // Approx 20 minutes. /datum/game_mode/var/max_autotraitor_delay = 12000 // Approx 20 minutes.
/datum/game_mode/var/process_count = 0
/datum/game_mode/proc/get_usable_templates(var/list/supplied_templates) /datum/game_mode/proc/get_usable_templates(var/list/supplied_templates)
var/list/usable_templates = list() var/list/usable_templates = list()
@@ -13,6 +14,10 @@
///process() ///process()
///Called by the gameticker ///Called by the gameticker
/datum/game_mode/proc/process() /datum/game_mode/proc/process()
// Slow this down a bit so latejoiners have a chance of being antags.
process_count++
if(process_count >= 10)
process_count = 0
try_latespawn() try_latespawn()
/datum/game_mode/proc/latespawn(var/mob/living/carbon/human/character) /datum/game_mode/proc/latespawn(var/mob/living/carbon/human/character)