From 3d7ed0df8625e089f97fa117e46ebc6eb8d50dd2 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 5 Mar 2021 14:26:42 -0500 Subject: [PATCH] :snowflake: be gone --- code/game/gamemodes/objective.dm | 12 ++++-------- code/game/gamemodes/steal_items.dm | 5 ++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 126ec28a686..a6e8a9a557e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -389,10 +389,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) explanation_text = "Steal [steal_target]. One was last seen in [get_location()]. " if(length(O.protected_jobs)) explanation_text += "It may also be in the possession of the [english_list(O.protected_jobs, and_text = " or ")]." - if(istype(O, /datum/theft_objective/supermatter_sliver)) - give_kit(/obj/item/storage/box/syndie_kit/supermatter) - if(istype(O, /datum/theft_objective/plutonium_core)) - give_kit(/obj/item/storage/box/syndie_kit/nuke) + if(steal_target.special_equipment) + give_kit(steal_target.special_equipment) return explanation_text = "Free Objective." @@ -414,10 +412,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) else steal_target = new new_target explanation_text = "Steal [steal_target.name]." - if(istype(steal_target, /datum/theft_objective/supermatter_sliver)) - give_kit(/obj/item/storage/box/syndie_kit/supermatter) - if(istype(steal_target, /datum/theft_objective/plutonium_core)) - give_kit(/obj/item/storage/box/syndie_kit/nuke) + if(steal_target.special_equipment) + give_kit(steal_target.special_equipment) return steal_target /datum/objective/steal/check_completion() diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 974a029b0ee..1b1a222cd9e 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -12,6 +12,8 @@ var/list/altitems = list() var/flags = 0 var/location_override + /// Do we have a special item we give to somewhen when they get this objective? + var/special_equipment = null /datum/theft_objective/proc/check_completion(var/datum/mind/owner) if(!owner.current) @@ -143,11 +145,12 @@ typepath = /obj/item/nuke_core/supermatter_sliver protected_jobs = list("Chief Engineer", "Engineer", "Atmospheric Technician") //Unlike other steal objectives, all jobs in the department have easy access, and would not be noticed at all stealing this location_override = "Engineering. You can use the box and instructions provided to harvest the sliver." - + special_equipment =/obj/item/storage/box/syndie_kit/supermatter /datum/theft_objective/plutonium_core name = "the plutonium core from the stations nuclear device" typepath = /obj/item/nuke_core/plutonium location_override = "the Vault. You can use the box and instructions provided to remove the core, with some extra tools." + special_equipment = /obj/item/storage/box/syndie_kit/nuke /datum/theft_objective/number var/min=0