diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ddaf95b8ffb..abdb1832d6f 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -743,7 +743,7 @@ datum/objective/minimize_casualties check_completion() if(owner.kills.len>5) return 0 return 1 - + //Vox heist objectives. datum/objective/heist diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index dccaabeff59..5a92a88c673 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -17,16 +17,13 @@ return 0 var/list/all_items = owner.current.get_contents() for(var/obj/I in all_items) //Check for items - if(istype(I, typepath) && check_special_completion(I)) + if(istype(I, typepath)) //Stealing the cheap autoinjector doesn't count if(istype(I, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) continue return 1 return 0 -/datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) - return 1 - /datum/theft_objective/antique_laser_gun name = "the captain's antique laser gun" typepath = /obj/item/weapon/gun/energy/laser/captain @@ -55,13 +52,6 @@ name = "a functional AI" typepath = /obj/item/device/aicard -datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) - if(..()) - for(var/mob/living/silicon/ai/A in C) - if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. - return 1 - return 0 - /datum/theft_objective/defib name = "a defibrillator" typepath = /obj/item/weapon/defibrillator @@ -83,20 +73,12 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) protected_jobs = list("Research Director") /datum/theft_objective/slime_extract - name = "a sample of unused slime extract" + name = "a sample of slime extract" typepath = /obj/item/slime_extract - protected_jobs = list("Research Director","Xenobiologist") - -/datum/theft_objective/slime_extract/check_special_completion(var/obj/item/slime_extract/E) - if(..()) - if(E.Uses > 0) - return 1 - return 0 /datum/theft_objective/corgi name = "a piece of corgi meat" typepath = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi - protected_jobs = list("Head of Personnel") /datum/theft_objective/capmedal name = "the medal of captaincy" @@ -151,7 +133,6 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective name = "an ablative armor vest" typepath = /obj/item/clothing/suit/armor/laserproof - protected_jobs = list("Head of Security", "Warden") /datum/theft_objective/number var/min=0 @@ -189,7 +170,6 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) typepath = /obj/item/weapon/tank min=28 max=28 - protected_jobs = list("Chief Engineer", "Engineer", "Scientist", "Research Director", "Life Support Specialist") /datum/theft_objective/number/plasma_gas/getAmountStolen(var/obj/item/I) return I:air_contents:toxins @@ -221,7 +201,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) flags = THEFT_FLAG_SPECIAL /datum/theft_objective/special/nuke_gun - name = "advanced energy gun" + name = "nuclear gun" typepath = /obj/item/weapon/gun/energy/gun/nuclear /datum/theft_objective/special/diamond_drill diff --git a/nano/debug.html b/nano/debug.html index b0938554f34..969956bacb2 100644 --- a/nano/debug.html +++ b/nano/debug.html @@ -16,7 +16,7 @@ - +