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

gives the bartender ONE JOB and actually nerfs compiling errors

Browse Source
This commit is contained in:
deathride58
2017-09-05 12:44:07 -04:00
parent 3a0d1dc982
commit c2d86f12e9
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/citadel/cit_crewobjectives.dm
View File

@@ -269,7 +269,7 @@
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD)
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.neck, /obj/item/clothing/neck/petcollar))
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
return 1
@@ -299,7 +299,7 @@
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD)
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.neck, /obj/item/clothing/neck/petcollar))
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
return 1
@@ -308,6 +308,19 @@
/* CIVILLIAN OBJECTIVES */
/datum/objective/crew/bartender
/datum/objective/crew/bartender/responsibility
explanation_text = "Make sure nobody dies of alchohol poisoning."
/datum/objective/crew/bartender/responsibility/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.reagents)
if(H.reagents.has_reagent(ethanol))
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(P)])
return 0
return 1
/datum/objective/crew/assistant
/datum/objective/crew/assistant/petsplosion
@@ -331,7 +344,7 @@
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD)
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(istype(H.neck, /obj/item/clothing/neck/petcollar))
if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
petcount--
if(petcount <= 0)
return 1