From 06d15bc0aa4e24aaeb6910801d59e335d2971166 Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Sun, 25 Aug 2019 15:49:50 +0100 Subject: [PATCH 1/3] Several changes to antag theft/document objectives --- code/game/gamemodes/steal_items.dm | 58 ++++++++++++++++---------- code/game/gamemodes/traitor/traitor.dm | 1 - 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 3d20040f128..3511d2c1db6 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -42,6 +42,11 @@ typepath = /obj/item/gun/energy/gun/hos protected_jobs = list("Head Of Security") +/datum/theft_objective/bsrevolver + name = "the blueshield's advanced stun revolver" + typepath = /obj/item/gun/energy/gun/blueshield + protected_jobs = list("Blueshield") + /datum/theft_objective/hand_tele name = "a hand teleporter" typepath = /obj/item/hand_tele @@ -89,23 +94,36 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) typepath = /obj/item/clothing/suit/space/nasavoid protected_jobs = list("Research Director") -/datum/theft_objective/slime_extract - name = "a sample of unused slime extract" - typepath = /obj/item/slime_extract - protected_jobs = list("Research Director","Scientist") - location_override = "Xenobiology" - -/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/capmedal name = "the medal of captaincy" typepath = /obj/item/clothing/accessory/medal/gold/captain protected_jobs = list("Captain") +/datum/theft_objective/secmedal + name = "the robust security medal" + typepath = /obj/item/clothing/accessory/medal/security + protected_jobs = list("Head Of Security") + +/datum/theft_objective/medmedal + name = "magnificient medical medal" + typepath = /obj/item/clothing/accessory/medal/medical + protected_jobs = list("Chief Medical Officer") + +/datum/theft_objective/engmedal + name = "the excellent engineering medal" + typepath = /obj/item/clothing/accessory/medal/engineering + protected_jobs = list("Chief Engineer") + +/datum/theft_objective/scimedal + name = "the smart science medal" + typepath = /obj/item/clothing/accessory/medal/science + protected_jobs = list("Research Director") + +/datum/theft_objective/sermedal + name = "the superior service medal" + typepath = /obj/item/clothing/accessory/medal/service + protected_jobs = list("Head of Personnel") + /datum/theft_objective/nukedisc name = "the nuclear authentication disk" typepath = /obj/item/disk/nuclear @@ -135,6 +153,11 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) typepath = /obj/item/clothing/gloves/color/black/krav_maga/sec protected_jobs = list("Head Of Security", "Warden") +/datum/theft_objective/forensics + name = "the detective's advanced forensics gloves" + typepath = /obj/item/clothing/gloves/color/black/forensics + protected_jobs = list("Head Of Security", "Detective") + /datum/theft_objective/number var/min=0 var/max=0 @@ -166,17 +189,6 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) /datum/theft_objective/number/proc/getAmountStolen(var/obj/item/I) return I:amount -/datum/theft_objective/number/plasma_gas - name = "moles of plasma (full tank)" - typepath = /obj/item/tank - min=28 - max=28 - protected_jobs = list("Chief Engineer", "Station Engineer", "Scientist", "Research Director", "Life Support Specialist") - location_override = "Engineering or Toxin Mixing" - -/datum/theft_objective/number/plasma_gas/getAmountStolen(var/obj/item/I) - return I:air_contents:toxins - /datum/theft_objective/unique flags = THEFT_FLAG_UNIQUE diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 3edf5b14e58..408c5fa1de9 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -117,7 +117,6 @@ exchange_blue = traitor assign_exchange_role(exchange_red) assign_exchange_role(exchange_blue) - objective_count += 1 //Exchange counts towards number of objectives var/list/active_ais = active_ais() for(var/i = objective_count, i < config.traitor_objectives_amount, i++) if(prob(50)) From aa3b622f16da20ffe7cbf9461305423a4f1fa66e Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Mon, 26 Aug 2019 01:43:42 +0100 Subject: [PATCH 2/3] Removed BS revolver and medals - added rapier --- code/game/gamemodes/steal_items.dm | 35 +++++------------------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 3511d2c1db6..98058fd68d9 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -37,16 +37,16 @@ typepath = /obj/item/tank/jetpack/oxygen/captain protected_jobs = list("Captain") +/datum/theft_objective/captains_rapier + name = "the captain's rapier" + typepath = /obj/item/melee/rapier + protected_jobs = list("Captain") + /datum/theft_objective/hoslaser name = "the head of security's recreated antique laser gun" typepath = /obj/item/gun/energy/gun/hos protected_jobs = list("Head Of Security") -/datum/theft_objective/bsrevolver - name = "the blueshield's advanced stun revolver" - typepath = /obj/item/gun/energy/gun/blueshield - protected_jobs = list("Blueshield") - /datum/theft_objective/hand_tele name = "a hand teleporter" typepath = /obj/item/hand_tele @@ -99,31 +99,6 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) typepath = /obj/item/clothing/accessory/medal/gold/captain protected_jobs = list("Captain") -/datum/theft_objective/secmedal - name = "the robust security medal" - typepath = /obj/item/clothing/accessory/medal/security - protected_jobs = list("Head Of Security") - -/datum/theft_objective/medmedal - name = "magnificient medical medal" - typepath = /obj/item/clothing/accessory/medal/medical - protected_jobs = list("Chief Medical Officer") - -/datum/theft_objective/engmedal - name = "the excellent engineering medal" - typepath = /obj/item/clothing/accessory/medal/engineering - protected_jobs = list("Chief Engineer") - -/datum/theft_objective/scimedal - name = "the smart science medal" - typepath = /obj/item/clothing/accessory/medal/science - protected_jobs = list("Research Director") - -/datum/theft_objective/sermedal - name = "the superior service medal" - typepath = /obj/item/clothing/accessory/medal/service - protected_jobs = list("Head of Personnel") - /datum/theft_objective/nukedisc name = "the nuclear authentication disk" typepath = /obj/item/disk/nuclear From 277ccce52dc4d9dd17e055bdcaaacf6488eb7849 Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Thu, 5 Sep 2019 19:06:31 +0100 Subject: [PATCH 3/3] loses the gloves --- code/game/gamemodes/steal_items.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 98058fd68d9..de9f8fc0eb7 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -128,11 +128,6 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) typepath = /obj/item/clothing/gloves/color/black/krav_maga/sec protected_jobs = list("Head Of Security", "Warden") -/datum/theft_objective/forensics - name = "the detective's advanced forensics gloves" - typepath = /obj/item/clothing/gloves/color/black/forensics - protected_jobs = list("Head Of Security", "Detective") - /datum/theft_objective/number var/min=0 var/max=0