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

fixes janitor objective, tones down other objectives

Browse Source
This commit is contained in:
deathride58
2017-09-06 13:18:39 -04:00
parent 146d11dfad
commit c9a340de27
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/cit_crewobjectives.dm
+19 -25
View File
@@ -219,14 +219,13 @@
return 0
return 1
/datum/objective/crew/chiefmedicalofficer/chems //Ported from old Hippie with adjustments
/datum/objective/crew/chiefmedicalofficer/chems //Ported from old Hippie
var/targetchem = "none"
var/datum/reagent/chempath
explanation_text = "Ensure at least (yo something broke here) living crew members have (yell about this in the development discussion channel of citadel's discord) in their bloodstream when the shift ends."
explanation_text = "Have (yell about this in the development discussion channel of citadel's discord, something broke) in your bloodstream when the shift ends."
/datum/objective/crew/chiefmedicalofficer/chems/New()
. = ..()
target_amount = rand(2,5)
var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/omnizine, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/earthsblood, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingAdrenaline, /datum/reagent/medicine/changelingAdrenaline2)
var/drugs = typesof(/datum/reagent/drug) - blacklist
var/meds = typesof(/datum/reagent/medicine) - blacklist
@@ -237,17 +236,14 @@
/datum/objective/crew/chiefmedicalofficer/chems/update_explanation_text()
. = ..()
explanation_text = "Ensure at least [target_amount] living crew members have [initial(chempath.name)] in their bloodstream when the shift ends."
explanation_text = "Have [initial(chempath.name)] in your bloodstream when the shift ends."
/datum/objective/crew/chiefmedicalofficer/chems/check_completion()
var/gotchems = target_amount
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD && H.reagents)
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.reagents.has_reagent(targetchem))
gotchems--
if(gotchems <= 0)
return 1
if(owner.current)
if(!owner.stat == DEAD && owner.reagents)
if(owner.reagents.has_reagent(targetchem))
return 1
else
return 0
@@ -265,14 +261,13 @@
/datum/objective/crew/chemist/
/datum/objective/crew/chemist/chems //Ported from old Hippie with adjustments
/datum/objective/crew/chemist/chems //Ported from old Hippie
var/targetchem = "none"
var/datum/reagent/chempath
explanation_text = "Ensure at least (yo something broke here) living crew members have (yell about this in the development discussion channel of citadel's discord) in their bloodstream when the shift ends."
explanation_text = "Have (yell about this in the development discussion channel of citadel's discord, something broke) in your bloodstream when the shift ends."
/datum/objective/crew/chemist/chems/New()
. = ..()
target_amount = rand(2,5)
var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/omnizine, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/earthsblood, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingAdrenaline, /datum/reagent/medicine/changelingAdrenaline2)
var/drugs = typesof(/datum/reagent/drug) - blacklist
var/meds = typesof(/datum/reagent/medicine) - blacklist
@@ -283,17 +278,14 @@
/datum/objective/crew/chemist/chems/update_explanation_text()
. = ..()
explanation_text = "Ensure at least [target_amount] living crew members have [initial(chempath.name)] in their bloodstream when the shift ends."
explanation_text = "Have [initial(chempath.name)] in your bloodstream when the shift ends."
/datum/objective/crew/chemist/chems/check_completion()
var/gotchems = target_amount
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(!H.stat == DEAD && H.reagents)
if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
if(H.reagents.has_reagent(targetchem))
gotchems--
if(gotchems <= 0)
return 1
if(owner.current)
if(!owner.stat == DEAD && owner.reagents)
if(owner.reagents.has_reagent(targetchem))
return 1
else
return 0
@@ -319,7 +311,6 @@
/datum/objective/crew/quartermaster/petsplosion/New()
. = ..()
target_amount = rand(10,75)
update_explanation_text()
/datum/objective/crew/quartermaster/petsplosion/update_explanation_text()
@@ -349,7 +340,6 @@
/datum/objective/crew/assistant/petsplosion/New()
. = ..()
target_amount = rand(10,75)
update_explanation_text()
/datum/objective/crew/cargotechnician/petsplosion/update_explanation_text()
@@ -412,6 +402,10 @@
explanation_text += " [(areas.len ==1) ? "is completely" : "are [(areas.len == 2) ? "completely" : "all"]"] spotless at the end of the shift."
/datum/objective/crew/janitor/clean/check_completion()
for(var/area/A in areas)
for(var/obj/effect/decal/A in area_contents(A)
return 0
return 1
/datum/objective/crew/assistant
@@ -420,7 +414,7 @@
/datum/objective/crew/assistant/petsplosion/New()
. = ..()
target_amount = rand(10,25)
target_amount = rand(10,20)
update_explanation_text()
/datum/objective/crew/assistant/petsplosion/update_explanation_text()