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

fixes merge conflict

Browse Source
This commit is contained in:
Kyep
2017-02-13 22:27:06 -08:00
parent 3aeb37eedb d53434d3d3
commit cdf35ce9da
71 changed files with 1706 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_panel.dm
+7
View File
@@ -531,6 +531,13 @@
if(ticker.mode.greyshirts.len)
dat += check_role_table("Greyshirts", ticker.mode.greyshirts)
if(ts_spiderlist.len)
var/list/spider_minds = list()
for(var/mob/living/simple_animal/hostile/poison/terror_spider/S in ts_spiderlist)
if(S.ckey)
spider_minds += S.mind
dat += check_role_table("Terror Spiders", spider_minds)
if(ticker.mode.ert.len)
dat += check_role_table("ERT", ticker.mode.ert)