cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge conflict

Browse Source
This commit is contained in:
Kyep
2019-05-10 09:56:58 -07:00
parent f4de59a4f8 6ca7ad4cc4
commit 1b0defba92
307 changed files with 6254 additions and 6029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/one_click_antag.dm
-11
View File
@@ -247,17 +247,6 @@ client/proc/one_click_antag()
if(closet_spawn)
new /obj/structure/closet/syndicate/nuclear(closet_spawn.loc)
for(var/obj/effect/landmark/A in /area/syndicate_station/start)//Because that's the only place it can BE -Sieve
if(A.name == "Syndicate-Gear-Closet")
new /obj/structure/closet/syndicate/personal(A.loc)
qdel(A)
continue
if(A.name == "Syndicate-Bomb")
new /obj/effect/spawner/newbomb/timer/syndicate(A.loc)
qdel(A)
continue
for(var/datum/mind/synd_mind in ticker.mode.syndicates)
if(synd_mind.current)
if(synd_mind.current.client)