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

druglord objective + fixes

Browse Source
This commit is contained in:
deathride58
2017-09-06 16:34:38 -04:00
parent 1753a4509a
commit 4bcb9f1629
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/citadel/cit_crewobjectives.dm
View File

@@ -239,7 +239,6 @@
explanation_text = "Have [initial(chempath.name)] in your bloodstream when the shift ends."
/datum/objective/crew/chiefmedicalofficer/chems/check_completion()
var/gotchems = target_amount
if(owner.current)
if(!owner.current.stat == DEAD && owner.current.reagents)
if(owner.current.reagents.has_reagent(targetchem))
@@ -281,7 +280,6 @@
explanation_text = "Have [initial(chempath.name)] in your bloodstream when the shift ends."
/datum/objective/crew/chemist/chems/check_completion()
var/gotchems = target_amount
if(owner.current)
if(!owner.current.stat == DEAD && owner.current.reagents)
if(owner.current.reagents.has_reagent(targetchem))
@@ -289,6 +287,30 @@
else
return 0
/datum/objective/crew/chemist/druglord //ported from hippie,
var/targetchem = "none"
var/datum/reagent/chempath
explanation_text = "Have at least (somethin broke here) pills containing (report this on the development discussion channel of citadel's discord) when the shift ends."
/datum/objective/crew/chemist/druglord/New()
. = ..()
target_amount = rand(5,50)
var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol)
var/drugs = typesof(/datum/reagent/drug) - blacklist
var/chemlist = drugs + /datum/reagent/anaphrodisiac + /datum/reagent/aphrodisiac
chempath = pick(chemlist)
targetchem = initial(chempath.id)
update_explanation_text()
/datum/objective/crew/chemist/druglord/update_explanation_text()
. = ..()
explanation_text = "Have at least [target_amount] pills containing [initial(chempath.name)] when the shift ends."
/datum/objective/crew/chemist/druglord/check_completion()
if(owner.current)
if(owner.current.contents)
/datum/objective/crew/medicaldoctor
/datum/objective/crew/medicaldoctor/morgue //Ported from old Hippie