From 9676b9f26dfe0d2663541d194afdbbe54ede500a Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 16 Sep 2017 23:18:57 -0400 Subject: [PATCH] places the cat firmly on a table --- .../cit_crewobjectives_cargo.dm | 12 ++-- .../cit_crewobjectives_civilian.dm | 36 ++++++------ .../cit_crewobjectives_command.dm | 18 +++--- .../cit_crewobjectives_engineering.dm | 12 ++-- .../cit_crewobjectives_medical.dm | 28 +++++----- .../cit_crewobjectives_science.dm | 8 +-- .../cit_crewobjectives_security.dm | 56 ++++++------------- 7 files changed, 73 insertions(+), 97 deletions(-) diff --git a/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm b/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm index 8ce77ed93b..bb3ef8b630 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm @@ -26,9 +26,9 @@ if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) petcount-- if(petcount <= 0) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/cargotechnician @@ -56,9 +56,9 @@ if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar)) petcount-- if(petcount <= 0) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/shaftminer @@ -68,5 +68,5 @@ /datum/objective/crew/shaftminer/bubblegum/check_completion() for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list) if(!B.stat == DEAD) - return 0 - return 1 + return FALSE + return TRUE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm index 4a51b1c3fa..500196bf98 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm @@ -30,9 +30,9 @@ if(P.reagents.has_reagent(targetchem)) pillcount-- if(pillcount <= 0) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/cook @@ -56,9 +56,9 @@ /datum/objective/crew/cook/foodhoard/check_completion() if(owner.current && owner.current.check_contents_for(foodpath) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/bartender @@ -69,8 +69,8 @@ for(var/mob/living/carbon/human/H in GLOB.mob_list) if(H.stat == DEAD && H.drunkenness >= 80) if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)]) - return 0 - return 1 + return FALSE + return TRUE /datum/objective/crew/janitor @@ -111,8 +111,8 @@ /datum/objective/crew/janitor/clean/check_completion() for(var/area/A in areas) for(var/obj/effect/decal/cleanable/C in area_contents(A)) - return 0 - return 1 + return FALSE + return TRUE /datum/objective/crew/clown @@ -135,9 +135,9 @@ for(var/mob/living/carbon/human/H in PDA.slipvictims) uniqueslips |= H if(uniqueslips.len >= target_amount) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/mime @@ -148,8 +148,8 @@ if(owner.current) var/list/say_log = owner.current.logging[INDIVIDUAL_SAY_LOG] if(say_log.len > 0) - return 0 - return 1 + return FALSE + return TRUE /datum/objective/crew/assistant @@ -172,8 +172,8 @@ if(owner.current) var/mob/living/carbon/human/H = owner.current if(istype(H.w_uniform, targetuniform)) - return 1 - return 0 + return TRUE + return FALSE /datum/objective/crew/assistant/spacesuit //ported from Goon explanation_text = "Get your grubby hands on a space suit." @@ -209,9 +209,9 @@ /datum/objective/crew/assistant/spacesuit/check_completion() if(owner.current && owner.current.check_contents_for(typesof(/obj/item/clothing/suit/space))) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/assistant/promotion //ported from Goon explanation_text = "Have a non-assistant ID registered to you at the end of the shift." @@ -222,5 +222,5 @@ var/obj/item/card/id/theID = H.get_idcard() if(istype(theID)) if(!H.get_assignment() == "Assistant" && !H.get_assignment() == "No id" && !H.get_assignment() == "No job") - return 1 - return 0 \ No newline at end of file + return TRUE + return FALSE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_command.dm b/code/citadel/crew_objectives/cit_crewobjectives_command.dm index c82954d6b2..7ea715dfa8 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_command.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_command.dm @@ -7,18 +7,18 @@ /datum/objective/crew/captain/hat/check_completion() if(owner.current && owner.current.check_contents_for(/obj/item/clothing/head/caphat)) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/captain/datfukkendisk //Ported from old Hippie explanation_text = "Defend the nuclear authentication disk at all costs, and be the one to personally deliver it to Centcom." /datum/objective/crew/captain/datfukkendisk/check_completion() if(owner.current && owner.current.check_contents_for(/obj/item/disk/nuclear) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/headofpersonnel/ @@ -29,15 +29,15 @@ if(owner.current) for(var/mob/living/simple_animal/pet/dog/corgi/Ian/goodboy in GLOB.mob_list) if(goodboy.stat != DEAD && SSshuttle.emergency.shuttle_areas[get_area(goodboy)]) - return 1 - return 0 - return 0 + return TRUE + return FALSE + return FALSE /datum/objective/crew/headofpersonnel/datfukkendisk //Ported from old Hippie explanation_text = "Defend the nuclear authentication disk at all costs, and be the one to personally deliver it to Centcom." /datum/objective/crew/headofpersonnel/datfukkendisk/check_completion() if(owner.current && owner.current.check_contents_for(/obj/item/disk/nuclear) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return 1 + return TRUE else - return 0 + return FALSE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_engineering.dm b/code/citadel/crew_objectives/cit_crewobjectives_engineering.dm index 36a44ef9a7..bb042f50aa 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_engineering.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_engineering.dm @@ -19,9 +19,9 @@ end_state.count() var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) if(!SSticker.mode.station_was_nuked && station_integrity >= target_amount) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/chiefengineer/poly explanation_text = "Make sure Poly keeps his headset, and stays alive until the end of the shift." @@ -30,8 +30,8 @@ for(var/mob/living/simple_animal/parrot/Poly/dumbbird in GLOB.mob_list) if(!dumbbird.stat == DEAD && dumbbird.ears) if(istype(dumbbird.ears, /obj/item/device/radio/headset)) - return 1 - return 0 + return TRUE + return FALSE /datum/objective/crew/stationengineer @@ -52,6 +52,6 @@ end_state.count() var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100) if(!SSticker.mode.station_was_nuked && station_integrity >= target_amount) - return 1 + return TRUE else - return 0 + return FALSE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm index ea2b2dca77..ec4228cc27 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm @@ -9,8 +9,8 @@ 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 + return FALSE + return TRUE /datum/objective/crew/chiefmedicalofficer/chems //Ported from old Hippie var/targetchem = "none" @@ -35,9 +35,9 @@ if(owner.current) if(!owner.current.stat == DEAD && owner.current.reagents) if(owner.current.reagents.has_reagent(targetchem)) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/geneticist @@ -48,8 +48,8 @@ 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 + return FALSE + return TRUE /datum/objective/crew/chemist/ @@ -76,9 +76,9 @@ if(owner.current) if(!owner.current.stat == DEAD && owner.current.reagents) if(owner.current.reagents.has_reagent(targetchem)) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/chemist/druglord //ported from old Hippie with adjustments var/targetchem = "none" @@ -107,9 +107,9 @@ if(P.reagents.has_reagent(targetchem)) pillcount-- if(pillcount <= 0) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/virologist @@ -121,8 +121,8 @@ if(!H.stat == DEAD) if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)]) if(H.check_virus() == 2) - return 0 - return 1 + return FALSE + return TRUE /datum/objective/crew/medicaldoctor @@ -133,5 +133,5 @@ 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 + return FALSE + return TRUE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_science.dm b/code/citadel/crew_objectives/cit_crewobjectives_science.dm index a186242141..addca3dbbf 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_science.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_science.dm @@ -20,9 +20,9 @@ if(!R.stat == DEAD) borgcount-- if(borgcount <= 0) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/roboticist/ @@ -44,6 +44,6 @@ if(!R.stat == DEAD) borgcount-- if(borgcount <= 0) - return 1 + return TRUE else - return 0 + return FALSE diff --git a/code/citadel/crew_objectives/cit_crewobjectives_security.dm b/code/citadel/crew_objectives/cit_crewobjectives_security.dm index d0e2443591..a20e48a6a5 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_security.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_security.dm @@ -7,9 +7,9 @@ /datum/objective/crew/headofsecurity/datfukkendisk/check_completion() if(owner.current && owner.current.check_contents_for(/obj/item/disk/nuclear) && SSshuttle.emergency.shuttle_areas[get_area(owner.current)]) - return 1 + return TRUE else - return 0 + return FALSE /datum/objective/crew/headofsecurity/enjoyyourstay explanation_text = "Welcome to Space Station 13. Enjoy your stay." @@ -20,18 +20,12 @@ /datum/objective/crew/headofsecurity/enjoyyourstay/update_explanation_text() . = ..() - var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.") + var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.", "Security is a mission, not an intermission.") explanation_text = pick(edglines) /datum/objective/crew/headofsecurity/enjoyyourstay/check_completion() - explanation_text = "Enforce Space Law at all costs." - if(owner.current) - var/mob/living/carbon/human/H = owner.current - var/obj/item/card/id/theID = H.get_idcard() - if(istype(theID)) - if(!H.get_assignment() == "Head of Security") - return 0 - return 1 + explanation_text = "Enforce Space Law to the best of your ability." + return TRUE /datum/objective/crew/securityofficer/ @@ -44,18 +38,12 @@ /datum/objective/crew/securityofficer/enjoyyourstay/update_explanation_text() . = ..() - var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.") + var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.", "Security is a mission, not an intermission.") explanation_text = pick(edglines) /datum/objective/crew/securityofficer/enjoyyourstay/check_completion() - explanation_text = "Enforce Space Law at all costs." - if(owner.current) - var/mob/living/carbon/human/H = owner.current - var/obj/item/card/id/theID = H.get_idcard() - if(istype(theID)) - if(!H.get_assignment() == "Security Officer") - return 0 - return 1 + explanation_text = "Enforce Space Law to the best of your ability." + return TRUE /datum/objective/crew/warden/ @@ -68,18 +56,12 @@ /datum/objective/crew/warden/enjoyyourstay/update_explanation_text() . = ..() - var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.") + var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.", "Security is a mission, not an intermission.") explanation_text = pick(edglines) /datum/objective/crew/warden/enjoyyourstay/check_completion() - explanation_text = "Enforce Space Law at all costs." - if(owner.current) - var/mob/living/carbon/human/H = owner.current - var/obj/item/card/id/theID = H.get_idcard() - if(istype(theID)) - if(!H.get_assignment() == "Warden") - return 0 - return 1 + explanation_text = "Enforce Space Law to the best of your ability." + return TRUE /datum/objective/crew/detective/ @@ -92,18 +74,12 @@ /datum/objective/crew/detective/enjoyyourstay/update_explanation_text() . = ..() - var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.", "Well, at least you know fashion.") + var/list/edglines = list("Welcome to Space Station 13. Enjoy your stay.", "You signed up for this.", "Abandon hope.", "The tide's gonna stop eventually.", "Hey, someone's gotta do it.", "No, you can't resign.", "Security is a mission, not an intermission.", "Well, at least you know fashion.") explanation_text = pick(edglines) /datum/objective/crew/detective/enjoyyourstay/check_completion() - explanation_text = "Enforce Space Law at all costs." - if(owner.current) - var/mob/living/carbon/human/H = owner.current - var/obj/item/card/id/theID = H.get_idcard() - if(istype(theID)) - if(!H.get_assignment() == "Detective") - return 0 - return 1 + explanation_text = "Enforce Space Law to the best of your ability." + return TRUE /datum/objective/crew/lawyer/ @@ -115,5 +91,5 @@ 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 + return FALSE + return TRUE