From 8a28e7ebaf525ac5a6e6305c1647ad220a4b8b4c Mon Sep 17 00:00:00 2001 From: Noname995 Date: Wed, 22 May 2024 21:27:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=20=D1=82=D0=B0=D0=BA.=20=D0=92=D1=80?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=20=D1=82=D0=BE=20=D1=87=D1=82=D0=BE=20=D1=8F?= =?UTF-8?q?=20=D1=85=D0=BE=D1=82=D0=B5=D0=BB,=20=D0=BF=D0=B8=D1=85=D0=BD?= =?UTF-8?q?=D1=83=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/projectiles/guns/rifles.dm | 3 +-- fray-marines/code/game/objects/items/attachable.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index c9e9daacc5a9..c1ee355a6e21 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -384,6 +384,7 @@ /obj/item/attachable/attached_gun/grenade/mk1, /obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/shotgun, + /obj/item/attachable/heavy_barrel/upgraded ) flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER @@ -460,8 +461,6 @@ /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/extended_barrel, - /obj/item/attachable/heavy_barrel, - /obj/item/attachable/heavy_barrel/upgraded, /obj/item/attachable/scope/mini, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, diff --git a/fray-marines/code/game/objects/items/attachable.dm b/fray-marines/code/game/objects/items/attachable.dm index 8f655fdde789..5a8dd6c00f88 100644 --- a/fray-marines/code/game/objects/items/attachable.dm +++ b/fray-marines/code/game/objects/items/attachable.dm @@ -3,7 +3,7 @@ /obj/item/attachable/heavy_barrel/upgraded name = "upgraded barrel charger" - desc = "A hyper threaded barrel extender that fits to the muzzle of most firearms. Increases bullet speed and velocity.\nGreatly increases projectile damage at the cost of accuracy and firing speed." + desc = "A hyper threaded barrel extender that fits to the muzzle of most firearms. Increases bullet speed and velocity.\nGreatly increases projectile damage at the cost of accuracy and firing speed. Can be attachable to MK1" icon = 'fray-marines/icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "ubc" attach_icon = "ubc_a"