From 209ff71fdfad738599f0aedbdc94b1ce4de255cd Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:33:56 +0700
Subject: [PATCH 01/16] Fixed1

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm     | 4 ++++
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme    | 3 +++
 modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm | 5 +++++
 modular_ss220/modular_ss220.dme                             | 1 +
 4 files changed, 13 insertions(+)
 create mode 100644 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
 create mode 100644 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme
 create mode 100644 modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
new file mode 100644
index 000000000000..8ba9e43355a9
--- /dev/null
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -0,0 +1,4 @@
+/datum/modpack/holstered_sawedoff
+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..e00c3ae1b681
--- /dev/null
+++ b/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm
@@ -0,0 +1,5 @@
+/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/modular_ss220.dme b/modular_ss220/modular_ss220.dme
index 7382887ee589..720c8185bfb6 100644
--- a/modular_ss220/modular_ss220.dme
+++ b/modular_ss220/modular_ss220.dme
@@ -70,6 +70,7 @@
 #include "outfits/_outfits.dme"
 #include "world_view_bigger/_world_view_bigger.dme"
 #include "mecha_skins/mecha_skins.dme"
+#include "holstered_sawedoff/_holstered_sawedoff.dme"
 
 // --- PRIME --- //
 // #define MODPACK_MAIN_ONLY

From 0ea8f9dc2b3272471c91f7b3af0b84034bada17b Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:54:33 +0700
Subject: [PATCH 02/16] Fix. WILL WORK!

---
 modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm
index e00c3ae1b681..2da607a9d763 100644
--- a/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm
@@ -1,5 +1,5 @@
 /obj/item/gun/projectile/revolver/doublebarrel/sawoff(mob/user)
-. = ..()
+	. = ..()
 	if(sawn_state == SAWN_OFF)
-        can_holster = TRUE
+		can_holster = TRUE
 		w_class = WEAPON_MEDIUM

From b1e75534fdf0d5ae03b4abc2cd14e6b976a916fd Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Mon, 23 Oct 2023 18:00:27 +0700
Subject: [PATCH 03/16] Added real authors...

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
index 8ba9e43355a9..faf7b5fad510 100644
--- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -1,4 +1,4 @@
 /datum/modpack/holstered_sawedoff
 name = "Обрезы в кобуру"
 desc = "Обрезы теперь можно убирать в кобуру."
-author = "Yata9arasu"
+author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"

From a5cd468c0084e5f42cb5e2d2284d8d69c1bea3b2 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:16:02 +0700
Subject: [PATCH 04/16] Fixed ig

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
index faf7b5fad510..b59f2ab52932 100644
--- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -1,4 +1,4 @@
 /datum/modpack/holstered_sawedoff
-name = "Обрезы в кобуру"
-desc = "Обрезы теперь можно убирать в кобуру."
-author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"
+    name = "Обрезы в кобуру"
+    desc = "Обрезы теперь можно убирать в кобуру."
+    author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"
\ No newline at end of file

From 93739a3be9a944176982a52d8a71a25c7ec7478d Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:20:02 +0700
Subject: [PATCH 05/16] 1

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
index b59f2ab52932..5578b180a63d 100644
--- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -1,4 +1,4 @@
 /datum/modpack/holstered_sawedoff
-    name = "Обрезы в кобуру"
+    name = "Обрезы в кoбуру"
     desc = "Обрезы теперь можно убирать в кобуру."
-    author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"
\ No newline at end of file
+    author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"

From 550ebd6fbfd89b0e8eccb189b23e97572bc2cf44 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:26:12 +0700
Subject: [PATCH 06/16] Fixed tabs

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
index 5578b180a63d..327c1e5aeb1c 100644
--- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -1,4 +1,4 @@
 /datum/modpack/holstered_sawedoff
-    name = "Обрезы в кoбуру"
+    name = "Обрезы в кобуру"
     desc = "Обрезы теперь можно убирать в кобуру."
     author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"

From 47723a407f0af7d92c6bada3089b8a43b6147ee3 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 25 Oct 2023 11:09:13 +0700
Subject: [PATCH 07/16] Spaced changed for tabs

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
index 327c1e5aeb1c..8bb1bc1f2a4b 100644
--- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -1,4 +1,4 @@
 /datum/modpack/holstered_sawedoff
-    name = "Обрезы в кобуру"
-    desc = "Обрезы теперь можно убирать в кобуру."
-    author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"
+	name = "Обрезы в кобуру"
+	desc = "Обрезы теперь можно убирать в кобуру."
+	author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"

From 15c887c22e70ed3039ab570342328e93d150d8e7 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 25 Oct 2023 11:12:48 +0700
Subject: [PATCH 08/16] Changed tabs

---
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
index 8bb1bc1f2a4b..d1e31a4f1c55 100644
--- a/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
+++ b/modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
@@ -1,4 +1,4 @@
 /datum/modpack/holstered_sawedoff
-	name = "Обрезы в кобуру"
+	name = "Обрезы в кобуре"
 	desc = "Обрезы теперь можно убирать в кобуру."
 	author = "Yata9arasu, Aylong220, TakeItEasyiloveyou"

From 32381c000161bfc12c7999e074431a4bd758279b Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:06:15 +0700
Subject: [PATCH 09/16] Changed module paths

---
 modular_ss220/balance/_balance.dm                           | 2 +-
 modular_ss220/balance/code/items/weapons.dm                 | 5 +++++
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm     | 4 ----
 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme    | 3 ---
 modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm | 5 -----
 5 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dm
 delete mode 100644 modular_ss220/holstered_sawedoff/_holstered_sawedoff.dme
 delete mode 100644 modular_ss220/holstered_sawedoff/code/holstered_sawedoff.dm

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

From 0e0e161ca2c18a40ff34bbb529dd6462a8c71ac2 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:17:45 +0700
Subject: [PATCH 10/16] Changing modules

---
 modular_ss220/balance/code/items/weapons.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modular_ss220/balance/code/items/weapons.dm b/modular_ss220/balance/code/items/weapons.dm
index cd7789ce4677..bf2dde6708a5 100644
--- a/modular_ss220/balance/code/items/weapons.dm
+++ b/modular_ss220/balance/code/items/weapons.dm
@@ -5,3 +5,4 @@
 	if(sawn_state == SAWN_OFF)
 		can_holster = TRUE
 		w_class = WEAPON_MEDIUM
+

From 519d95985ab7d469d1fc2bce3d218b1d966235d5 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:19:40 +0700
Subject: [PATCH 11/16] Changing paths

---
 modular_ss220/balance/code/items/weapons.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modular_ss220/balance/code/items/weapons.dm b/modular_ss220/balance/code/items/weapons.dm
index bf2dde6708a5..cd7789ce4677 100644
--- a/modular_ss220/balance/code/items/weapons.dm
+++ b/modular_ss220/balance/code/items/weapons.dm
@@ -5,4 +5,3 @@
 	if(sawn_state == SAWN_OFF)
 		can_holster = TRUE
 		w_class = WEAPON_MEDIUM
-

From 8bc013dd41f751d3430bca9d60579bf4d84dec33 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:25:40 +0700
Subject: [PATCH 12/16] No need this now

---
 modular_ss220/modular_ss220.dme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme
index 720c8185bfb6..7382887ee589 100644
--- a/modular_ss220/modular_ss220.dme
+++ b/modular_ss220/modular_ss220.dme
@@ -70,7 +70,6 @@
 #include "outfits/_outfits.dme"
 #include "world_view_bigger/_world_view_bigger.dme"
 #include "mecha_skins/mecha_skins.dme"
-#include "holstered_sawedoff/_holstered_sawedoff.dme"
 
 // --- PRIME --- //
 // #define MODPACK_MAIN_ONLY

From 226512d483f1beb0f6cf124bfe5d54350b91f30c Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Tue, 31 Oct 2023 09:31:40 +0700
Subject: [PATCH 13/16] Deleted authors

---
 modular_ss220/balance/_balance.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_ss220/balance/_balance.dm b/modular_ss220/balance/_balance.dm
index 76c01935ffef..0c56d172ca6a 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, Yata9arasu, Aylong220, TakeItEasyiloveyou"
+	author = "dj-34, larentoun, Yata9arasu"

From add1d20616c558c2ef31393f6630c1a6a4ea8119 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:50:16 +0700
Subject: [PATCH 14/16] vi jacket 1

---
 modular_ss220/loadout/code/donor.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm
index 7715f3b26361..d79d89160cf9 100644
--- a/modular_ss220/loadout/code/donor.dm
+++ b/modular_ss220/loadout/code/donor.dm
@@ -51,3 +51,9 @@
 	path = /obj/item/clothing/under/costume/katarina_cybersuit
 	donator_tier = 4
 	cost = 1
+
+/datum/gear/donor/v_jacket
+	display_name = "Куртка Ви"
+	path = /obj/item/clothing/suit/hooded/vi_arcane
+	donator_tier = 3
+	cost = 2

From 978362e44f50d3839f2f989feb30aa8716d4ab35 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:52:11 +0700
Subject: [PATCH 15/16] Revert "vi jacket 1"

This reverts commit add1d20616c558c2ef31393f6630c1a6a4ea8119.
---
 modular_ss220/loadout/code/donor.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm
index d79d89160cf9..7715f3b26361 100644
--- a/modular_ss220/loadout/code/donor.dm
+++ b/modular_ss220/loadout/code/donor.dm
@@ -51,9 +51,3 @@
 	path = /obj/item/clothing/under/costume/katarina_cybersuit
 	donator_tier = 4
 	cost = 1
-
-/datum/gear/donor/v_jacket
-	display_name = "Куртка Ви"
-	path = /obj/item/clothing/suit/hooded/vi_arcane
-	donator_tier = 3
-	cost = 2

From 1405471022a19e8a116d2a0bb7b0d92e84c1cb63 Mon Sep 17 00:00:00 2001
From: Yata <108077473+Yata9arasu@users.noreply.github.com>
Date: Wed, 8 Nov 2023 08:55:04 +0700
Subject: [PATCH 16/16] fixing textures

---
 modular_ss220/clothing/icons/mob/suits.dmi | Bin 4251 -> 4248 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/modular_ss220/clothing/icons/mob/suits.dmi b/modular_ss220/clothing/icons/mob/suits.dmi
index 0fa0557d35e62524cf7c7e1ac6d19fd5ac1116b6..9926c8f6509c5cbab1a56cfa60195f0afefe9a13 100644
GIT binary patch
delta 163
zcmV;U09^l@A($bsQ~?3JlT`sVe~F%q!&`sJ_qA!$j30|rS@HZ_vL4Bs*6{=1uhuMi
z7!~vwc3YNcG&ddQ-~$94%d{7FkQPJA5@pCw9!stS4Nmpu0|v0zbOf=yg#ct62svDk
zmP(Pl*FaWC@Ez2PV4>SqEi>xrdVeT!qvnN$ADlAylkSZGlHf3|`5XU65N5on^4I@7
R0Y(O~k;5K)VY3_pe-0`NOT+*G

delta 166
zcmV;X09pT-A)6tvQ~?3MlT`sVe+T2iIK1_jd|#V3&G@l6l@-s=CF_yAX&pcC{c6pU
zhfzU~VYg+8Msw3)4n9D@u}ph$2Wc^+EK!F1<gw&R(BM>W-e3TWO-B&RTL?hLfsn%m
zX{i*+dktiT1m8iu2o}0+)iR@=uJ?x$H)>v3_`xZIKk42GAPElRnt$Ro6MFwm$#_xa
UuSa?U&S<q!Znakfvl#+^4xwUAHvj+t