From 1120e53d360028297e9b4cb21c16fbf66e18c1e7 Mon Sep 17 00:00:00 2001 From: Lorwp Date: Sat, 28 Apr 2018 19:08:52 +1000 Subject: [PATCH] Destroys Drill meta Makes screwdriver hand drills not fit in places a normal screwdriver can --- code/game/objects/items/weapons/storage/uplink_kits.dm | 1 + code/game/objects/items/weapons/storage/wallets.dm | 1 + code/game/objects/items/weapons/tools.dm | 2 +- code/modules/integrated_electronics/core/tools.dm | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 5c0f837340..937663c65c 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -254,6 +254,7 @@ description_antag = "This case will likely contain a charged fuel rod gun, and a few fuel rods to go with it. It can only hold the fuel rod gun, fuel rods, batteries, a screwdriver, and stock machine parts." force = 12 //Anti-rad lined i.e. Lead, probably gonna hurt a bit if you get bashed with it. can_hold = list(/obj/item/weapon/gun/magnetic/fuelrod, /obj/item/weapon/fuel_assembly, /obj/item/weapon/cell, /obj/item/weapon/stock_parts, /obj/item/weapon/screwdriver) + cant_hold = list(/obj/item/weapon/screwdriver/power) starts_with = list( /obj/item/weapon/gun/magnetic/fuelrod, /obj/item/weapon/fuel_assembly/deuterium, diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index cb376787ab..cd3a450631 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -37,6 +37,7 @@ /obj/item/clothing/accessory/permit, /obj/item/clothing/accessory/badge ) + cant_hold = list(/obj/item/weapon/screwdriver/power) slot_flags = SLOT_ID var/obj/item/weapon/card/id/front_id = null diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 62b3d9b1bb..5fbba12e35 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -172,7 +172,7 @@ item_state = "drill" matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50) origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - + slot_flags = SLOT_BELT force = 8 w_class = ITEMSIZE_SMALL throwforce = 8 diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index 0f702be3de..5d4133e3d3 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -265,6 +265,7 @@ /obj/item/weapon/screwdriver, /obj/item/device/multitool ) + cant_hold = list(/obj/item/weapon/screwdriver/power) /obj/item/weapon/storage/bag/circuits/basic/New() ..()