From 4aa0977f19ef8249da23053cce9c42409ed7c075 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 22 May 2022 14:24:21 -0400 Subject: [PATCH] A couple more engineering QoL changes. --- .../crates_lockers/closets/secure/engineering.dm | 16 +++++++++++----- code/modules/economy/vending_machines.dm | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index e51832928b..6c5c0f5c27 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -11,7 +11,7 @@ /obj/item/clothing/under/rank/chief_engineer, /obj/item/clothing/under/rank/chief_engineer/skirt, /obj/item/clothing/head/hardhat/white, - /obj/item/clothing/head/welding, + ///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these. /obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit /obj/item/clothing/shoes/brown, /obj/item/weapon/cartridge/ce, @@ -19,20 +19,26 @@ /obj/item/device/radio/headset/heads/ce/alt, /obj/item/weapon/storage/toolbox/mechanical, /obj/item/clothing/suit/storage/hazardvest, - /obj/item/clothing/mask/gas, - /obj/item/device/multitool, + ///obj/item/clothing/mask/gas, //VOREStation Removal: Locker bloat, grr. The fancy one below functions as a mask & helmet combined. + /obj/item/clothing/head/hardhat/firefighter/chief, //VOREStation Add: replaces the bog-standard gas mask + ///obj/item/device/multitool, //VOREStation Removal: The belt they get, both standard and the fancy one, both come with one already, why stick another in here too? /obj/item/weapon/storage/belt/utility/chief/full, /obj/item/device/flash, /obj/item/device/t_scanner/upgraded, /obj/item/taperoll/engineering, - /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, + ///obj/item/clothing/suit/storage/hooded/wintercoat/engineering, //VOREStation Removal: Locker bloat, grr. They can grab from the engi-clothes vendor if they want the standard one. /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce, - /obj/item/clothing/shoes/boots/winter/engineering, + ///obj/item/clothing/shoes/boots/winter/engineering, //VOREStation Removal: Locker bloat, grr. As above. /obj/item/clothing/head/beret/engineering/ce, /obj/item/clothing/head/beret/engineering/ce/white, +<<<<<<< HEAD /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add, /obj/item/weapon/pipe_dispenser) //YW Add +======= + /obj/item/weapon/tank/emergency/oxygen/double, //VOREStation Edit: chief gets the good shit + /obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add +>>>>>>> e66e0e9531... Merge pull request #13000 from BonniePandora/Another-Engi-QoL-patch /obj/structure/closet/secure_closet/engineering_chief/Initialize() if(prob(50)) diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 90776a7189..bd79cb1f7b 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -628,6 +628,7 @@ /obj/item/device/analyzer = 5, /obj/item/device/t_scanner = 5, /obj/item/weapon/tool/screwdriver = 5, + /obj/item/weapon/extinguisher/mini = 3, /obj/item/device/flashlight/glowstick = 3, /obj/item/device/flashlight/glowstick/red = 3, /obj/item/device/flashlight/glowstick/blue = 3,