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

there we go

Browse Source
This commit is contained in:
deathride58
2017-09-17 00:35:03 -04:00
parent a10f27ff14
commit e8c7cb4f51
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/crew_objectives/cit_crewobjectives_cargo.dm
+5 -5
View File
@@ -17,11 +17,11 @@
/datum/objective/crew/quartermaster/petsplosion/check_completion() /datum/objective/crew/quartermaster/petsplosion/check_completion()
var/petcount = target_amount var/petcount = target_amount
for(var/mob/living/simple_animal/pet/P in GLOB.mob_list) for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
if!(P.stat == DEAD) if !(P.stat == DEAD)
if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)]) if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)])
petcount-- petcount--
for(var/mob/living/carbon/human/H in GLOB.mob_list) for(var/mob/living/carbon/human/H in GLOB.mob_list)
if!(H.stat == DEAD) if !(H.stat == DEAD)
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)]) if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount-- petcount--
@@ -47,11 +47,11 @@
/datum/objective/crew/cargotechnician/petsplosion/check_completion() /datum/objective/crew/cargotechnician/petsplosion/check_completion()
var/petcount = target_amount var/petcount = target_amount
for(var/mob/living/simple_animal/pet/P in GLOB.mob_list) for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
if!(P.stat == DEAD) if !(P.stat == DEAD)
if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)]) if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)])
petcount-- petcount--
for(var/mob/living/carbon/human/H in GLOB.mob_list) for(var/mob/living/carbon/human/H in GLOB.mob_list)
if!(H.stat == DEAD) if !(H.stat == DEAD)
if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)]) if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount-- petcount--
@@ -67,6 +67,6 @@
/datum/objective/crew/shaftminer/bubblegum/check_completion() /datum/objective/crew/shaftminer/bubblegum/check_completion()
for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list) for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
if!(B.stat == DEAD) if !(B.stat == DEAD)
return FALSE return FALSE
return TRUE return TRUE
code/citadel/crew_objectives/cit_crewobjectives_science.dm
+2 -2
View File
@@ -17,7 +17,7 @@
/datum/objective/crew/researchdirector/cyborgs/check_completion() /datum/objective/crew/researchdirector/cyborgs/check_completion()
var/borgcount = target_amount 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.living_mob_list)
if(!R.stat == DEAD) if !(R.stat == DEAD)
borgcount-- borgcount--
if(borgcount <= 0) if(borgcount <= 0)
return TRUE return TRUE
@@ -41,7 +41,7 @@
/datum/objective/crew/roboticist/cyborgs/check_completion() /datum/objective/crew/roboticist/cyborgs/check_completion()
var/borgcount = target_amount 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.living_mob_list)
if(!R.stat == DEAD) if !(R.stat == DEAD)
borgcount-- borgcount--
if(borgcount <= 0) if(borgcount <= 0)
return TRUE return TRUE