diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm new file mode 100644 index 000000000000..f48e99cf9e30 --- /dev/null +++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm @@ -0,0 +1,4 @@ +/datum/modpack/DBs_In_Holsters +name = "Обрезы в кобуру" +desc = "Обрезы теперь можно убирать в кобуру." +author = "Yata9arasu" diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme new file mode 100644 index 000000000000..ca8b860c506d --- /dev/null +++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme @@ -0,0 +1,3 @@ +#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 new file mode 100644 index 000000000000..073ff01e788d --- /dev/null +++ b/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm @@ -0,0 +1,12 @@ +/obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user) + . = ..() + weapon_weight = WEAPON_MEDIUM + can_holster = TRUE + + /obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user) + . = ..() + if(. && sling) //sawing off the gun removes the sling + new /obj/item/stack/cable_coil(get_turf(src), 10) + sling = FALSE + update_icon(UPDATE_ICON_STATE) + can_holster = TRUE diff --git a/modular_ss220/maps220/code/Areas/station.dm b/modular_ss220/maps220/code/Areas/station.dm index 41603beeac59..c7974a0bafcb 100644 --- a/modular_ss220/maps220/code/Areas/station.dm +++ b/modular_ss220/maps220/code/Areas/station.dm @@ -2,9 +2,6 @@ /area/station/security/checkpoint/south name = "\improper Escape Security Checkpoint" -/area/station/security/visitingroom - name = "\improper Brig Visiting Room" - icon_state = "brig" /area/station/bridge/checkpoint name = "\improper Command Checkpoint" diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 83f04b970dc9..930b81f4a125 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -68,6 +68,7 @@ #include "title_screen/_title_screen.dme" #include "whitelist/_whitelist.dme" #include "outfits/_outfits.dme" +#include "holstered_sawedoff/_holstered_sawedoff.dme" #include "world_view_bigger/_world_view_bigger.dme" // --- PRIME --- // @@ -91,3 +92,12 @@ ---------------------------------------------------------------------*/ // #include "crit_rework/_crit_rework.dme" +// BEGIN_INTERNALS +// END_INTERNALS +// BEGIN_FILE_DIR +#define FILE_DIR . +// END_FILE_DIR +// BEGIN_PREFERENCES +// END_PREFERENCES +// BEGIN_INCLUDE +// END_INCLUDE