From 02ec9714fb7f348127a2a081b1e2ea61219c46c8 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:52:34 -0400 Subject: [PATCH 1/3] Fixes grammer / bugs with supermater sliver and nuke core objectives --- code/game/gamemodes/objective.dm | 2 +- code/game/gamemodes/steal_items.dm | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b5bb07ff234..e4d3aecd279 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -389,7 +389,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) steal_target = O explanation_text = "Steal [steal_target]. One was last seen in [get_location()]. " - if(length(O.protected_jobs)) + if(length(O.protected_jobs) && O.job_possession) explanation_text += "It may also be in the possession of the [english_list(O.protected_jobs, and_text = " or ")]." if(steal_target.special_equipment) give_kit(steal_target.special_equipment) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 24ea05d786c..28ab4f78194 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -14,6 +14,8 @@ var/location_override /// Do we have a special item we give to somewhen when they get this objective? var/special_equipment = null + ///If a steal objective has forbiden jobs, and the forbiden jobs would not be in the possession of this item, set this to false + var/job_possession = TRUE /datum/theft_objective/proc/check_completion(datum/mind/owner) if(!owner.current) @@ -144,13 +146,14 @@ name = "a supermatter sliver" 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." + location_override = "Engineering. You can use the box and instructions provided to harvest the sliver" special_equipment = /obj/item/storage/box/syndie_kit/supermatter + job_possession = FALSE //The CE / engineers / atmos techs do not carry around supermater slivers. /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." + 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 From 8f169f787e0cab9106a8e3450ce73bc9d602d506 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 12 Aug 2021 12:28:44 -0400 Subject: [PATCH 2/3] oops Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/game/gamemodes/steal_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 28ab4f78194..a0860ada7f5 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -14,7 +14,7 @@ var/location_override /// Do we have a special item we give to somewhen when they get this objective? var/special_equipment = null - ///If a steal objective has forbiden jobs, and the forbiden jobs would not be in the possession of this item, set this to false + /// If a steal objective has forbiden jobs, and the forbiden jobs would not be in the possession of this item, set this to false var/job_possession = TRUE /datum/theft_objective/proc/check_completion(datum/mind/owner) From 0aeb2d97bd0c1a876870c241d393a3f4d454e83d Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 12 Aug 2021 13:20:22 -0400 Subject: [PATCH 3/3] Update code/game/gamemodes/steal_items.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- code/game/gamemodes/steal_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index a0860ada7f5..62dfcc37eaa 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -14,7 +14,7 @@ var/location_override /// Do we have a special item we give to somewhen when they get this objective? var/special_equipment = null - /// If a steal objective has forbiden jobs, and the forbiden jobs would not be in the possession of this item, set this to false + /// If a steal objective has forbidden jobs, and the forbidden jobs would not be in the possession of this item, set this to false var/job_possession = TRUE /datum/theft_objective/proc/check_completion(datum/mind/owner)