From 5a5fb250e6dd51642543b4cceb6db5bee2cb5d2d Mon Sep 17 00:00:00 2001 From: NotRanged Date: Mon, 8 Feb 2021 22:23:33 +0100 Subject: [PATCH] Engineering ERT members get power tools (#56589) Engi ERT now get power tools, upgraded RCDs, and a rapid pipe dispenser. --- code/game/objects/items/RCD.dm | 4 ++++ code/game/objects/items/storage/belt.dm | 10 +++++++++- code/modules/clothing/outfits/ert.dm | 8 +++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 1289c3a902a..a89808c6aad 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -712,6 +712,9 @@ RLD /obj/item/construction/rcd/loaded matter = 160 +/obj/item/construction/rcd/loaded/upgraded + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING + /obj/item/construction/rcd/combat name = "industrial RCD" icon_state = "ircd" @@ -719,6 +722,7 @@ RLD max_matter = 500 matter = 500 canRturf = TRUE + upgrade = RCD_UPGRADE_FRAMES | RCD_UPGRADE_SIMPLE_CIRCUITS | RCD_UPGRADE_FURNISHING /obj/item/rcd_ammo name = "compressed matter cartridge" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 4b5690b1b03..c4cf97d02c0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -98,6 +98,15 @@ new /obj/item/multitool(src) new /obj/item/stack/cable_coil(src) +/obj/item/storage/belt/utility/full/powertools/PopulateContents() + new /obj/item/screwdriver/power(src) + new /obj/item/crowbar/power(src) + new /obj/item/weldingtool/experimental(src) + new /obj/item/multitool(src) + new /obj/item/holosign_creator/atmos(src) + new /obj/item/extinguisher/mini(src) + new /obj/item/stack/cable_coil(src) + /obj/item/storage/belt/utility/full/engi/PopulateContents() new /obj/item/screwdriver(src) new /obj/item/wrench(src) @@ -107,7 +116,6 @@ new /obj/item/multitool(src) new /obj/item/stack/cable_coil(src) - /obj/item/storage/belt/utility/atmostech/PopulateContents() new /obj/item/screwdriver(src) new /obj/item/wrench(src) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 35f44b644a5..59705f0cfc7 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -131,12 +131,13 @@ suit_store = /obj/item/gun/energy/e_gun glasses = /obj/item/clothing/glasses/meson/engine back = /obj/item/storage/backpack/ert/engineer - belt = /obj/item/storage/belt/utility/full + belt = /obj/item/storage/belt/utility/full/powertools l_pocket = /obj/item/rcd_ammo/large l_hand = /obj/item/storage/firstaid/regular backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ /obj/item/melee/baton/loaded=1,\ - /obj/item/construction/rcd/loaded=1) + /obj/item/construction/rcd/loaded/upgraded=1,\ + /obj/item/pipe_dispenser=1) /datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -156,7 +157,8 @@ backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ /obj/item/melee/baton/loaded=1,\ /obj/item/gun/energy/pulse/pistol/loyalpin=1,\ - /obj/item/construction/rcd/combat=1) + /obj/item/construction/rcd/combat=1,\ + /obj/item/pipe_dispenser=1) /datum/outfit/centcom/centcom_official