TG sync Sunday (#201)
* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
This commit is contained in:
@@ -193,7 +193,7 @@
|
||||
/obj/machinery/capture_the_flag/attack_ghost(mob/user)
|
||||
if(ctf_enabled == FALSE)
|
||||
return
|
||||
if(ticker.current_state != GAME_STATE_PLAYING)
|
||||
if(ticker.current_state < GAME_STATE_PLAYING)
|
||||
return
|
||||
if(user.ckey in team_members)
|
||||
if(user.ckey in recently_dead_ckeys)
|
||||
@@ -580,7 +580,7 @@
|
||||
CTF.dead_barricades += src
|
||||
|
||||
/obj/effect/ctf/dead_barricade/proc/respawn()
|
||||
if(!qdeleted(src))
|
||||
if(!QDELETED(src))
|
||||
new /obj/structure/barricade/security/ctf(get_turf(src))
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
|
||||
return
|
||||
if(!detect())
|
||||
return
|
||||
if(!awaygate || qdeleted(awaygate))
|
||||
if(!awaygate || QDELETED(awaygate))
|
||||
return
|
||||
|
||||
if(awaygate.calibrated)
|
||||
@@ -214,7 +214,7 @@ var/obj/machinery/gateway/centerstation/the_gateway = null
|
||||
return
|
||||
if(!active)
|
||||
return
|
||||
if(!stationgate || qdeleted(stationgate))
|
||||
if(!stationgate || QDELETED(stationgate))
|
||||
return
|
||||
if(istype(AM, /mob/living/carbon))
|
||||
var/mob/living/carbon/C = AM
|
||||
|
||||
Reference in New Issue
Block a user