diff --git a/modular_ss220/balance/_balance.dm b/modular_ss220/balance/_balance.dm index d8d825f5ff43..76c01935ffef 100644 --- a/modular_ss220/balance/_balance.dm +++ b/modular_ss220/balance/_balance.dm @@ -1,4 +1,4 @@ /datum/modpack/balance name = "Баланс" desc = "Твики баланса." - author = "dj-34, larentoun" + author = "dj-34, larentoun, Yata9arasu, Aylong220, TakeItEasyiloveyou" diff --git a/modular_ss220/balance/code/items/weapons.dm b/modular_ss220/balance/code/items/weapons.dm index 2a71b5f76849..cd7789ce4677 100644 --- a/modular_ss220/balance/code/items/weapons.dm +++ b/modular_ss220/balance/code/items/weapons.dm @@ -1,2 +1,7 @@ /obj/item/melee/baton/cattleprod w_class = WEIGHT_CLASS_NORMAL +/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user) + . = ..() + if(sawn_state == SAWN_OFF) + can_holster = TRUE + w_class = WEAPON_MEDIUM diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm deleted file mode 100644 index d1e31a4f1c55..000000000000 --- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/modpack/holstered_sawedoff - name = "Обрезы в кобуре" - desc = "Обрезы теперь можно убирать в кобуру." - author = "Yata9arasu, Aylong220, TakeItEasyiloveyou" diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme deleted file mode 100644 index ca8b860c506d..000000000000 --- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme +++ /dev/null @@ -1,3 +0,0 @@ -#include "_holstered_sawedoff.dm" - -#include "code/holstered_sawedoff.dm" diff --git a/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm deleted file mode 100644 index 2da607a9d763..000000000000 --- a/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user) - . = ..() - if(sawn_state == SAWN_OFF) - can_holster = TRUE - w_class = WEAPON_MEDIUM