shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-32188

Browse Source
This commit is contained in:
deathride58
2017-11-18 05:31:42 +00:00
committed by GitHub
parent bc1f65b381 9e78bcd8f9
commit eeba86e27e
109 changed files with 452 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/crew_objectives/cit_crewobjectives_science.dm
+2 -2
View File
@@ -15,7 +15,7 @@
/datum/objective/crew/cyborgs/check_completion()
var/borgcount = target_amount
for(var/mob/living/silicon/robot/R in GLOB.living_mob_list)
for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list)
if(!(R.stat == DEAD))
borgcount--
if(borgcount <= 0)
@@ -42,4 +42,4 @@
if(S && S.files && S.files.known_designs)
if(targetdesign in S.files.known_designs)
return TRUE
return FALSE
return FALSE