cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14988 from KorPhaeron/ctf

Browse Source 
Shuffles CTF check order
This commit is contained in:
tkdrg
2016-01-29 21:58:40 -03:00
parent e015f429f4 7b2dc3fe73
commit d3765adbe0
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/capture_the_flag.dm
+9 -8
View File
@@ -118,6 +118,15 @@
return
if(ticker.current_state != GAME_STATE_PLAYING)
return
if(user.ckey in team_members)
if(user.mind.current && user.mind.current.timeofdeath + CTF_RESPAWN_COOLDOWN > world.time)
user << "It must be more than 15 seconds from your last death to respawn!"
return
var/client/new_team_member = user.client
dust_old(user)
spawn_team_member(new_team_member)
return
for(var/obj/machinery/capture_the_flag/CTF in machines)
if(CTF == src || CTF.ctf_enabled == FALSE)
continue
@@ -127,14 +136,6 @@
if(CTF.team_members.len < src.team_members.len)
user << "[src.team] has more team members than [CTF.team]. Try joining [CTF.team] to even things up."
return
if(user.ckey in team_members)
if(user.mind.current && user.mind.current.timeofdeath + CTF_RESPAWN_COOLDOWN > world.time)
user << "It must be more than 15 seconds from your last death to respawn!"
return
var/client/new_team_member = user.client
dust_old(user)
spawn_team_member(new_team_member)
return
team_members |= user.ckey
var/client/new_team_member = user.client
dust_old(user)