From 94e579cd35fcfee0bb38ca99c566f077a081cbef Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:44:42 +0100 Subject: [PATCH] [MIRROR] Emergency hotfix for engi crossbow [NO GBP] [MDB IGNORE] (#24910) * Emergency hotfix for engi crossbow [NO GBP] (#79606) Hadnt added these commits when the PR got merged due to not expecting it oops ## Why It's Good For The Game See above, used to make my last pr actually function as intended. ## Changelog :cl: fix: fixed engi crossbow being able to be used onehanded + ability to craft with sci inducers /:cl: --------- Co-authored-by: Jacquerel * Emergency hotfix for engi crossbow [NO GBP] --------- Co-authored-by: KingkumaArt <69398298+KingkumaArt@users.noreply.github.com> Co-authored-by: Jacquerel --- code/datums/components/crafting/ranged_weapon.dm | 3 +++ code/modules/projectiles/guns/ballistic/rifle.dm | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/components/crafting/ranged_weapon.dm b/code/datums/components/crafting/ranged_weapon.dm index cc9988e45e9..a8b64f428d9 100644 --- a/code/datums/components/crafting/ranged_weapon.dm +++ b/code/datums/components/crafting/ranged_weapon.dm @@ -214,6 +214,9 @@ /obj/item/stack/cable_coil = 12, /obj/item/inducer = 1, ) + blacklist = list( + /obj/item/inducer/sci, + ) tool_behaviors = list(TOOL_WELDER) time = 5 SECONDS category = CAT_WEAPON_RANGED diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 48d61a112f5..a7a1206db1f 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -179,7 +179,7 @@ inhand_icon_state = "rebarxbow" worn_icon_state = "rebarxbow" rack_sound = 'sound/weapons/gun/sniper/rack.ogg' - must_hold_to_load = FALSE + must_hold_to_load = TRUE mag_display = FALSE empty_indicator = TRUE bolt_type = BOLT_TYPE_LOCKING @@ -191,6 +191,7 @@ magazine_wording = "rod" cartridge_wording = "rod" misfire_probability = 25 + weapon_weight = WEAPON_HEAVY initial_caliber = CALIBER_REBAR accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/normal fire_sound = 'sound/items/syringeproj.ogg'