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

more objectives + fixes

Browse Source
This commit is contained in:
deathride58
2017-09-05 01:12:05 -04:00
parent 4af7100b7b
commit 38e4c86666
1 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/citadel/cit_crewobjectives.dm
+62 -4
View File
@@ -88,7 +88,7 @@
if(owner.current)
for(var/datum/mind/M in SSticker.minds)
if(M.current && isliving(M.current))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && get_area(M.current) != typesof(/area/security))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && !M.assigned_role == "Warden" && get_area(M.current) != typesof(/area/security))
return 0
return 1
@@ -110,7 +110,20 @@
if(owner.current)
for(var/datum/mind/M in SSticker.minds)
if(M.current && isliving(M.current))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && get_area(M.current) != typesof(/area/security))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && !M.assigned_role == "Warden" && get_area(M.current) != typesof(/area/security))
return 0
return 1
/datum/objective/crew/warden/
/datum/objective/crew/warden/justicecrew
explanation_text = "Ensure there are no innocent crew members in the brig when the shift ends."
/datum/objective/crew/warden/justicecrew/check_completion()
if(owner.current)
for(var/datum/mind/M in SSticker.minds)
if(M.current && isliving(M.current))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && !M.assigned_role == "Warden" && get_area(M.current) != typesof(/area/security))
return 0
return 1
@@ -123,7 +136,7 @@
if(owner.current)
for(var/datum/mind/M in SSticker.minds)
if(M.current && isliving(M.current))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && get_area(M.current) != typesof(/area/security))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && !M.assigned_role == "Warden" && get_area(M.current) != typesof(/area/security))
return 0
return 1
@@ -136,7 +149,7 @@
if(owner.current)
for(var/datum/mind/M in SSticker.minds)
if(M.current && isliving(M.current))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && get_area(M.current) != typesof(/area/security))
if(!M.special_role && !M.assigned_role == "Security Officer" && !M.assigned_role == "Detective" && !M.assigned_role == "Head of Security" && !M.assigned_role == "Lawyer" && !M.assigned_role == "Warden" && get_area(M.current) != typesof(/area/security))
return 0
return 1
@@ -189,3 +202,48 @@
return 1
else
return 0
/* ENGINEERING OBJECTIVES */
/* MEDICAL OBJECTIVES */
/datum/objective/crew/chiefmedicalofficer/
/datum/objective/crew/chiefmedicalofficer/morgue
explanation_text = "Ensure there are no corpses on the station outside of the morgue when the shift ends."
/datum/objective/crew/chiefmedicalofficer/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION)
if(get_area.H != /area/medical/morgue)
return 0
return 1
/datum/objective/crew/geneticist
/datum/objective/crew/geneticist/morgue
explanation_text = "Ensure there are no corpses on the station outside of the morgue when the shift ends."
/datum/objective/crew/geneticist/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION)
if(get_area.H != /area/medical/morgue)
return 0
return 1
/datum/objective/crew/medicaldoctor
/datum/objective/crew/medicaldoctor/morgue
explanation_text = "Ensure there are no corpses on the station outside of the morgue when the shift ends."
/datum/objective/crew/medicaldoctor/morgue/check_completion()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
if(H.stat == DEAD && H.z == ZLEVEL_STATION)
if(get_area.H != /area/medical/morgue)
return 0
return 1
/* CARGO OBJECTIVES */
/* CIVILLIAN OBJECTIVES */