From c2d86f12e99c158acfb49623cd8e281c79cd898f Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 5 Sep 2017 12:44:07 -0400 Subject: [PATCH] gives the bartender ONE JOB and actually nerfs compiling errors --- code/citadel/cit_crewobjectives.dm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/code/citadel/cit_crewobjectives.dm b/code/citadel/cit_crewobjectives.dm index e05c90e1d8..3bed8fb1a9 100644 --- a/code/citadel/cit_crewobjectives.dm +++ b/code/citadel/cit_crewobjectives.dm @@ -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