From e9e8c45839641da9118686f3df4b6a5b8d2e0f24 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 2 Jun 2022 17:47:11 -0400 Subject: [PATCH] Randomizes the reactive armor in the RD's office (#17888) * Randomizes the reactive armor in the RD's office * subtypesof * Update code/modules/clothing/suits/armor.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * final stuff * convert to initalize Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> --- code/game/gamemodes/steal_items.dm | 6 +++--- .../crates_lockers/closets/secure/scientist.dm | 2 +- code/modules/clothing/suits/armor.dm | 9 +++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 76d2eb5f236..473374b094e 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -114,9 +114,9 @@ location_override = "the Captain's Office" /datum/theft_objective/reactive - name = "the reactive teleport armor" - typepath = /obj/item/clothing/suit/armor/reactive/teleport - protected_jobs = list("Research Director") + name = "any type of reactive armor" + typepath = /obj/item/clothing/suit/armor/reactive + protected_jobs = list("Research Director", "Scientist", "Roboticist") //no one with protolathe access, who will often be handed a core location_override = "the Research Director's Office" /datum/theft_objective/steal/documents diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 87c79dba8c0..7aa2a5930d0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -54,7 +54,7 @@ new /obj/item/radio/headset/heads/rd(src) new /obj/item/tank/internals/air(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/suit/armor/reactive/teleport(src) + new /obj/item/clothing/suit/armor/reactive/random(src) new /obj/item/flash(src) new /obj/item/laser_pointer(src) new /obj/item/door_remote/research_director(src) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 56af7885aa9..3370b0e772e 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -442,6 +442,15 @@ disable(rand(2, 5)) return TRUE +/obj/item/clothing/suit/armor/reactive/random //Spawner for random reactive armor + name = "Random Reactive Armor" + +/obj/item/clothing/suit/armor/reactive/random/Initialize(mapload) + . = ..() + var/spawnpath = pick(subtypesof(/obj/item/clothing/suit/armor/reactive) - /obj/item/clothing/suit/armor/reactive/random) + new spawnpath(loc) + qdel(src) + //All of the armor below is mostly unused