From 6116feeed6e81a2c57c75c20548602b7b2db6975 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Sun, 21 Jul 2024 15:34:25 +0800
Subject: [PATCH 01/11] Initial commit

---
 modular_bandastation/modular_bandastation.dme |   1 +
 modular_bandastation/objects/_objects.dm      |   0
 modular_bandastation/objects/_objects.dme     |   1 +
 modular_bandastation/objects/code/hampters.dm |  87 ++++++++++++++++
 modular_bandastation/objects/code/wallets.dm  |  93 ++++++++++++++++++
 .../objects/icons/hampter.dmi                 | Bin 0 -> 5230 bytes
 .../objects/icons/inhead/head.dmi             | Bin 0 -> 2213 bytes
 .../objects/icons/onbody/id.dmi               | Bin 0 -> 391 bytes
 .../objects/icons/wallets.dmi                 | Bin 0 -> 3565 bytes
 9 files changed, 182 insertions(+)
 create mode 100644 modular_bandastation/objects/_objects.dm
 create mode 100644 modular_bandastation/objects/_objects.dme
 create mode 100644 modular_bandastation/objects/code/hampters.dm
 create mode 100644 modular_bandastation/objects/code/wallets.dm
 create mode 100644 modular_bandastation/objects/icons/hampter.dmi
 create mode 100644 modular_bandastation/objects/icons/inhead/head.dmi
 create mode 100644 modular_bandastation/objects/icons/onbody/id.dmi
 create mode 100644 modular_bandastation/objects/icons/wallets.dmi

diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme
index 74d6a43ea38f8..4740a7129065e 100644
--- a/modular_bandastation/modular_bandastation.dme
+++ b/modular_bandastation/modular_bandastation.dme
@@ -28,3 +28,4 @@
 #include "preferences/_preferences.dme"
 #include "drinks/_drinks.dme"
 #include "jukebox/_jukebox.dme"
+#include "objects/_objects.dme"
diff --git a/modular_bandastation/objects/_objects.dm b/modular_bandastation/objects/_objects.dm
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme
new file mode 100644
index 0000000000000..76dc81ec65475
--- /dev/null
+++ b/modular_bandastation/objects/_objects.dme
@@ -0,0 +1 @@
+#include "_objects.dm"
diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm
new file mode 100644
index 0000000000000..ffd8b201528a6
--- /dev/null
+++ b/modular_bandastation/objects/code/hampters.dm
@@ -0,0 +1,87 @@
+// Хамптер
+/obj/item/toy/plush/hampter
+	name = "хамптер"
+	desc = "Просто плюшевый хамптер. Самый обычный."
+	icon = 'modular_bandastation/objects/icons/hampter.dmi'
+	icon_state = "hampter"
+	lefthand_file = 'modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi'
+	righthand_file = 'modular_bandastation/objects/icons/inhands/hampter_righthand.dmi'
+	inhand_icon_state = "hampter"
+	worn_icon = 'modular_bandastation/objects/icons/inhead/head.dmi'
+	worn_icon_state = "hampter"
+	slot_flags = ITEM_SLOT_HEAD
+	w_class = WEIGHT_CLASS_TINY
+	var/cooldown = 0
+
+// Действия при взаимодействии с включенным комбат модом
+/obj/item/toy/plush/hampter/attack_self(mob/living/carbon/human/user)
+	if(cooldown < world.time - 10)
+		. = ..()
+		if(user.combat_mode == TRUE)
+			new /obj/effect/decal/cleanable/blood(get_turf(user))
+			user.visible_message(span_warning("[user] раздавливает хамптера в своей руке!"), span_warning("Вы раздавливаете хамптера в своей руке, и от него остаётся лужа крови!"))
+			qdel(src)
+
+// Подвиды
+/obj/item/toy/plush/hampter/assistant
+	name = "хамптер ассистент"
+	desc = "Плюшевый хамптер ассистент. Зачем ему изольки?"
+	icon_state = "hampter_ass"
+	inhand_icon_state = "hampter_ass"
+	worn_icon_state = "hampter_ass"
+
+/obj/item/toy/plush/hampter/security
+	name = "хамптер офицер"
+	desc = "Плюшевый хамптер офицер службы безопасности. У него станбатон!"
+	icon_state = "hampter_sec"
+	inhand_icon_state = "hampter_sec"
+	worn_icon_state = "hampter_sec"
+
+/obj/item/toy/plush/hampter/medical
+	name = "хамптер врач"
+	desc = "Плюшевый хамптер врач. Тащите дефибриллятор!"
+	icon_state = "hampter_med"
+	inhand_icon_state = "hampter_med"
+	worn_icon_state = "hampter_med"
+
+/obj/item/toy/plush/hampter/janitor
+	name = "хамптер уборщик"
+	desc = "Плюшевый хамптер уборщик. Переключись на шаг."
+	icon_state = "hampter_jan"
+	inhand_icon_state = "hampter_jan"
+	worn_icon_state = "hampter_jan"
+
+/obj/item/toy/plush/hampter/old_captain
+	name = "хамптер старый капитан"
+	desc = "ПЛюшевый хамптер капитан в старой униформе. Это какой год?"
+	icon_state = "hampter_old-cap"
+	inhand_icon_state = "hampter_old-cap"
+	worn_icon_state = "hampter_old-cap"
+
+/obj/item/toy/plush/hampter/captain
+	name = "хамптер капитан"
+	desc = "Плюшевый хамптер капитан. Где его запасная карта?"
+	icon_state = "hampter_cap"
+	inhand_icon_state = "hampter_cap"
+	worn_icon_state = "hampter_cap"
+
+/obj/item/toy/plush/hampter/syndicate
+	name = "хамптер Синдиката"
+	desc = "Плюшевый хамптер агент Синдиката. Ваши активы пострадают."
+	icon_state = "hampter_sdy"
+	inhand_icon_state = "hampter_sdy"
+	worn_icon_state = "hampter_sdy"
+
+/obj/item/toy/plush/hampter/deadsquad
+	name = "хамптер Дедсквада"
+	desc = "Плюшевый хамптер Отряда Смерти. Все контракты расторгнуты."
+	icon_state = "hampter_ded"
+	inhand_icon_state = "hampter_ded"
+	worn_icon_state = "hampter_ded"
+
+/obj/item/toy/plush/hampter/ert
+	name = "хамптер ОБР"
+	desc = "Плюшевый хамптер ОБР. Доложите о ситуации на станции."
+	icon_state = "hampter_ert"
+	inhand_icon_state = "hampter_ert"
+	worn_icon_state = "hampter_ert"
diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/wallets.dm
new file mode 100644
index 0000000000000..1683f772cccd4
--- /dev/null
+++ b/modular_bandastation/objects/code/wallets.dm
@@ -0,0 +1,93 @@
+/obj/item/storage/wallet/wallet_NT
+	name = "leather wallet NT"
+	desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_NT"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_NT"
+
+/obj/item/storage/wallet/wallet_NT/update_overlays()
+	. = ..()
+	cached_flat_icon = null
+	if(!front_id)
+		return
+	. += mutable_appearance(front_id.icon, front_id.icon_state)
+	. += front_id.overlays
+	. += mutable_appearance(icon, "wallet_NT_overlay")
+
+/obj/item/storage/wallet/wallet_NT/update_label()
+	if(front_id)
+		name = "leather NT wallet displaying [front_id]"
+		return
+	name = "leather NT wallet"
+
+/obj/item/storage/wallet/wallet_USSP_1
+	name = "leather USSP wallet"
+	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_USSP_1"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_USSP_1"
+
+/obj/item/storage/wallet/wallet_USSP_1/update_overlays()
+	. = ..()
+	cached_flat_icon = null
+	if(!front_id)
+		return
+	. += mutable_appearance(front_id.icon, front_id.icon_state)
+	. += front_id.overlays
+	. += mutable_appearance(icon, "wallet_USSP_1_overlay")
+
+/obj/item/storage/wallet/wallet_USSP_1/update_label()
+	if(front_id)
+		name = "leather USSP wallet displaying [front_id]"
+		return
+	name = "leather USSP wallet"
+
+/obj/item/storage/wallet/wallet_USSP_2
+	name = "leather USSP wallet"
+	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_USSP_2"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_USSP_2"
+
+/obj/item/storage/wallet/wallet_USSP_2/update_overlays()
+	. = ..()
+	cached_flat_icon = null
+	if(!front_id)
+		return
+	. += mutable_appearance(front_id.icon, front_id.icon_state)
+	. += front_id.overlays
+	. += mutable_appearance(icon, "wallet_USSP_2_overlay")
+
+/obj/item/storage/wallet/wallet_USSP_2/update_label()
+	if(front_id)
+		name = "leather USSP wallet displaying [front_id]"
+		return
+	name = "leather USSP wallet"
+
+/obj/item/storage/wallet/wallet_wyci
+	name = "W.Y.C.I. wallet"
+	desc = "Кошелек, законодателя моды WYCI,\
+	украшен золотой пуговицей cшит позолочеными и платиновыми нитями, сверх прочный.\
+	И сверх модный. И сверх дорогой. И сшит по принципу WYCI."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_wyci"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_wyci"
+
+/obj/item/storage/wallet/wallet_wyci/update_overlays()
+	. = ..()
+	cached_flat_icon = null
+	if(!front_id)
+		return
+	. += mutable_appearance(front_id.icon, front_id.icon_state)
+	. += front_id.overlays
+	. += mutable_appearance(icon, "wallet_wyci_overlay")
+
+/obj/item/storage/wallet/wallet_wyci/update_label()
+	if(front_id)
+		name = "W.Y.C.I. wallet displaying [front_id]"
+		return
+	name = "W.Y.C.I. wallet"
diff --git a/modular_bandastation/objects/icons/hampter.dmi b/modular_bandastation/objects/icons/hampter.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..4c73360608c4ef851290994f0839468f588d0cfb
GIT binary patch
literal 5230
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

literal 0
HcmV?d00001

diff --git a/modular_bandastation/objects/icons/inhead/head.dmi b/modular_bandastation/objects/icons/inhead/head.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..b47d9ce9b1a55049cb2c868b895bc2eb48ce8572
GIT binary patch
literal 2213
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

literal 0
HcmV?d00001

diff --git a/modular_bandastation/objects/icons/onbody/id.dmi b/modular_bandastation/objects/icons/onbody/id.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..088b58808664c96ff4648bfa3e9fea53334e8e1d
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq004jh004jl0{{R3F%W$C0000gP)t-sz`(#w
zNOiNw)cf)_A099{HCARhF-S;APz(rRCL<s<Yo@Bd2M<XP8Cz@?8bbg800DGTPE!Ct
z=GbNc004n{R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM
z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSJTWIHwIsg0GC5O;i!&v&s2HS`i!-e#
zF*g;&HpEaH8XO!DZ%C4ABVtwih2T=Dtl;YB0`?*R3BN<8sRrX@0001fNkl<ZXo2n4
zyA4197)4<U5)uVr0+UEAU<r>2Y#=5ugvSIn5EGb2@2{>zBj>A6ZhajG0Di~K3nfoX
z?Ut1?keb?yGi9KXY5)N6g5M8H-k91SCuN{Dbx?Q8z$DcG0N@4w0RRAa3im_F7gLAl
lr3|d5j^<4nxTG5R-VJgd7d(;{84dsd002ovPDHLkV1m=DkJbPH

literal 0
HcmV?d00001

diff --git a/modular_bandastation/objects/icons/wallets.dmi b/modular_bandastation/objects/icons/wallets.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1532d8b3516b7f13ed93d72cd5bb9d367e57f913
GIT binary patch
literal 3565
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
W%<bYz@;>l?1DTpw7*`nHjrb34OYegK

literal 0
HcmV?d00001


From 875f82fc08a322ba36a21aa41f6b3ca3347850f0 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Sun, 21 Jul 2024 15:38:21 +0800
Subject: [PATCH 02/11] oops

---
 modular_bandastation/objects/_objects.dm  | 4 ++++
 modular_bandastation/objects/_objects.dme | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/modular_bandastation/objects/_objects.dm b/modular_bandastation/objects/_objects.dm
index e69de29bb2d1d..f31dbc53aba91 100644
--- a/modular_bandastation/objects/_objects.dm
+++ b/modular_bandastation/objects/_objects.dm
@@ -0,0 +1,4 @@
+/datum/modpack/objects
+	name = "Объекты"
+	desc = "В основном включает в себя портированные объекты и всякие мелочи, которым не нужен отдельный модпак."
+	author = "dj-34, Chorden"
diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme
index 76dc81ec65475..d750704851c1b 100644
--- a/modular_bandastation/objects/_objects.dme
+++ b/modular_bandastation/objects/_objects.dme
@@ -1 +1,4 @@
 #include "_objects.dm"
+
+#include "code/wallets.dm"
+#include "code/hampters.dm"

From 9cb4df2566e8c3b52a53d4452a9cce8e7fec958b Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Sun, 21 Jul 2024 15:49:22 +0800
Subject: [PATCH 03/11] Added inhands sprites

---
 .../objects/icons/inhands/hampter_lefthand.dmi   | Bin 0 -> 4125 bytes
 .../objects/icons/inhands/hampter_righthand.dmi  | Bin 0 -> 1913 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi
 create mode 100644 modular_bandastation/objects/icons/inhands/hampter_righthand.dmi

diff --git a/modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi b/modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..99fd270e738bf90639d45197d0a8467f5236c554
GIT binary patch
literal 4125
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

literal 0
HcmV?d00001

diff --git a/modular_bandastation/objects/icons/inhands/hampter_righthand.dmi b/modular_bandastation/objects/icons/inhands/hampter_righthand.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e19b04cd235cda0bdb68449fb355626707f01396
GIT binary patch
literal 1913
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

literal 0
HcmV?d00001


From 561bcf43a046e90da6e1b8df7bc5a88a0f16b3a4 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Sun, 21 Jul 2024 16:05:16 +0800
Subject: [PATCH 04/11] Changes after review

---
 modular_bandastation/objects/code/wallets.dm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/wallets.dm
index 1683f772cccd4..668cf8f05c09c 100644
--- a/modular_bandastation/objects/code/wallets.dm
+++ b/modular_bandastation/objects/code/wallets.dm
@@ -17,9 +17,9 @@
 
 /obj/item/storage/wallet/wallet_NT/update_label()
 	if(front_id)
-		name = "leather NT wallet displaying [front_id]"
+		name = "[src::name] displaying [front_id]"
 		return
-	name = "leather NT wallet"
+	name = src::name
 
 /obj/item/storage/wallet/wallet_USSP_1
 	name = "leather USSP wallet"
@@ -40,9 +40,9 @@
 
 /obj/item/storage/wallet/wallet_USSP_1/update_label()
 	if(front_id)
-		name = "leather USSP wallet displaying [front_id]"
+		name = "[src::name] displaying [front_id]"
 		return
-	name = "leather USSP wallet"
+	name = src::name
 
 /obj/item/storage/wallet/wallet_USSP_2
 	name = "leather USSP wallet"
@@ -63,9 +63,9 @@
 
 /obj/item/storage/wallet/wallet_USSP_2/update_label()
 	if(front_id)
-		name = "leather USSP wallet displaying [front_id]"
+		name = "[src::name] displaying [front_id]"
 		return
-	name = "leather USSP wallet"
+	name = src::name
 
 /obj/item/storage/wallet/wallet_wyci
 	name = "W.Y.C.I. wallet"
@@ -88,6 +88,6 @@
 
 /obj/item/storage/wallet/wallet_wyci/update_label()
 	if(front_id)
-		name = "W.Y.C.I. wallet displaying [front_id]"
+		name = "[src::name] displaying [front_id]"
 		return
-	name = "W.Y.C.I. wallet"
+	name = src::name

From 7bcd30230caca5c31131eb9dfbd4fa81acd0793d Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 18:23:07 +0800
Subject: [PATCH 05/11] Wallets overlay refactor

---
 modular_bandastation/objects/code/wallets.dm | 40 ++------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/wallets.dm
index 668cf8f05c09c..110d642c68aca 100644
--- a/modular_bandastation/objects/code/wallets.dm
+++ b/modular_bandastation/objects/code/wallets.dm
@@ -5,15 +5,7 @@
 	icon_state = "wallet_NT"
 	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
 	worn_icon_state = "wallet_NT"
-
-/obj/item/storage/wallet/wallet_NT/update_overlays()
-	. = ..()
-	cached_flat_icon = null
-	if(!front_id)
-		return
-	. += mutable_appearance(front_id.icon, front_id.icon_state)
-	. += front_id.overlays
-	. += mutable_appearance(icon, "wallet_NT_overlay")
+	overlay_icon_state = "wallet_NT_overlay"
 
 /obj/item/storage/wallet/wallet_NT/update_label()
 	if(front_id)
@@ -28,15 +20,7 @@
 	icon_state = "wallet_USSP_1"
 	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
 	worn_icon_state = "wallet_USSP_1"
-
-/obj/item/storage/wallet/wallet_USSP_1/update_overlays()
-	. = ..()
-	cached_flat_icon = null
-	if(!front_id)
-		return
-	. += mutable_appearance(front_id.icon, front_id.icon_state)
-	. += front_id.overlays
-	. += mutable_appearance(icon, "wallet_USSP_1_overlay")
+	overlay_icon_state = "wallet_USSP_1_overlay"
 
 /obj/item/storage/wallet/wallet_USSP_1/update_label()
 	if(front_id)
@@ -51,15 +35,7 @@
 	icon_state = "wallet_USSP_2"
 	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
 	worn_icon_state = "wallet_USSP_2"
-
-/obj/item/storage/wallet/wallet_USSP_2/update_overlays()
-	. = ..()
-	cached_flat_icon = null
-	if(!front_id)
-		return
-	. += mutable_appearance(front_id.icon, front_id.icon_state)
-	. += front_id.overlays
-	. += mutable_appearance(icon, "wallet_USSP_2_overlay")
+	overlay_icon_state = "wallet_USSP_2_overlay"
 
 /obj/item/storage/wallet/wallet_USSP_2/update_label()
 	if(front_id)
@@ -76,15 +52,7 @@
 	icon_state = "wallet_wyci"
 	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
 	worn_icon_state = "wallet_wyci"
-
-/obj/item/storage/wallet/wallet_wyci/update_overlays()
-	. = ..()
-	cached_flat_icon = null
-	if(!front_id)
-		return
-	. += mutable_appearance(front_id.icon, front_id.icon_state)
-	. += front_id.overlays
-	. += mutable_appearance(icon, "wallet_wyci_overlay")
+	overlay_icon_state = "wallet_wyci_overlay"
 
 /obj/item/storage/wallet/wallet_wyci/update_label()
 	if(front_id)

From f5a3f69052945f17a0fcb05778bf56c728731aa4 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 18:25:24 +0800
Subject: [PATCH 06/11] Space

---
 modular_bandastation/objects/_objects.dme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme
index 8f8cf1c2799af..5b175bcf4ff5f 100644
--- a/modular_bandastation/objects/_objects.dme
+++ b/modular_bandastation/objects/_objects.dme
@@ -4,4 +4,4 @@
 #include "code/hampters.dm"
 #include "code/papershredder.dm"
 #include "code/material_pouch.dm"
-#include "code/structures/posters.dm"
\ No newline at end of file
+#include "code/structures/posters.dm"

From a29b1b3da0effe5ba79a8c1f8b16df252ca1ca95 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 18:29:49 +0800
Subject: [PATCH 07/11] Cleaned up code

---
 modular_bandastation/objects/code/wallets.dm | 24 --------------------
 1 file changed, 24 deletions(-)

diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/wallets.dm
index 110d642c68aca..4b7d6aa54fdad 100644
--- a/modular_bandastation/objects/code/wallets.dm
+++ b/modular_bandastation/objects/code/wallets.dm
@@ -7,12 +7,6 @@
 	worn_icon_state = "wallet_NT"
 	overlay_icon_state = "wallet_NT_overlay"
 
-/obj/item/storage/wallet/wallet_NT/update_label()
-	if(front_id)
-		name = "[src::name] displaying [front_id]"
-		return
-	name = src::name
-
 /obj/item/storage/wallet/wallet_USSP_1
 	name = "leather USSP wallet"
 	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
@@ -22,12 +16,6 @@
 	worn_icon_state = "wallet_USSP_1"
 	overlay_icon_state = "wallet_USSP_1_overlay"
 
-/obj/item/storage/wallet/wallet_USSP_1/update_label()
-	if(front_id)
-		name = "[src::name] displaying [front_id]"
-		return
-	name = src::name
-
 /obj/item/storage/wallet/wallet_USSP_2
 	name = "leather USSP wallet"
 	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
@@ -37,12 +25,6 @@
 	worn_icon_state = "wallet_USSP_2"
 	overlay_icon_state = "wallet_USSP_2_overlay"
 
-/obj/item/storage/wallet/wallet_USSP_2/update_label()
-	if(front_id)
-		name = "[src::name] displaying [front_id]"
-		return
-	name = src::name
-
 /obj/item/storage/wallet/wallet_wyci
 	name = "W.Y.C.I. wallet"
 	desc = "Кошелек, законодателя моды WYCI,\
@@ -53,9 +35,3 @@
 	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
 	worn_icon_state = "wallet_wyci"
 	overlay_icon_state = "wallet_wyci_overlay"
-
-/obj/item/storage/wallet/wallet_wyci/update_label()
-	if(front_id)
-		name = "[src::name] displaying [front_id]"
-		return
-	name = src::name

From 270f6451bcd26f5411bb8316fceb3161819e97ed Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 18:58:29 +0800
Subject: [PATCH 08/11] Changes after review

---
 modular_bandastation/objects/code/hampters.dm | 19 +++++++++----------
 modular_bandastation/objects/code/wallets.dm  |  8 ++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm
index ffd8b201528a6..06db2b38ec98b 100644
--- a/modular_bandastation/objects/code/hampters.dm
+++ b/modular_bandastation/objects/code/hampters.dm
@@ -1,4 +1,3 @@
-// Хамптер
 /obj/item/toy/plush/hampter
 	name = "хамптер"
 	desc = "Просто плюшевый хамптер. Самый обычный."
@@ -11,18 +10,18 @@
 	worn_icon_state = "hampter"
 	slot_flags = ITEM_SLOT_HEAD
 	w_class = WEIGHT_CLASS_TINY
-	var/cooldown = 0
+	COOLDOWN_DECLARE(plush_cooldown)
 
-// Действия при взаимодействии с включенным комбат модом
 /obj/item/toy/plush/hampter/attack_self(mob/living/carbon/human/user)
-	if(cooldown < world.time - 10)
-		. = ..()
-		if(user.combat_mode == TRUE)
-			new /obj/effect/decal/cleanable/blood(get_turf(user))
-			user.visible_message(span_warning("[user] раздавливает хамптера в своей руке!"), span_warning("Вы раздавливаете хамптера в своей руке, и от него остаётся лужа крови!"))
-			qdel(src)
+	if(!COOLDOWN_FINISHED(src, plush_cooldown))
+		return
+	COOLDOWN_START(src, plush_cooldown, 2 SECONDS)
+	. = ..()
+	if(user.combat_mode == TRUE)
+		new /obj/effect/decal/cleanable/blood(get_turf(user))
+		user.visible_message(span_warning("[user] раздавил хамптера в своей руке!"), span_warning("Ты с особой жестокостью давишь хамптера в своей руке, оставляя от него лишь лужу крови!"))
+		qdel(src)
 
-// Подвиды
 /obj/item/toy/plush/hampter/assistant
 	name = "хамптер ассистент"
 	desc = "Плюшевый хамптер ассистент. Зачем ему изольки?"
diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/wallets.dm
index 4b7d6aa54fdad..54d80bc938ae5 100644
--- a/modular_bandastation/objects/code/wallets.dm
+++ b/modular_bandastation/objects/code/wallets.dm
@@ -1,4 +1,4 @@
-/obj/item/storage/wallet/wallet_NT
+/obj/item/storage/wallet/nt
 	name = "leather wallet NT"
 	desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе."
 	icon = 'modular_bandastation/objects/icons/wallets.dmi'
@@ -7,7 +7,7 @@
 	worn_icon_state = "wallet_NT"
 	overlay_icon_state = "wallet_NT_overlay"
 
-/obj/item/storage/wallet/wallet_USSP_1
+/obj/item/storage/wallet/ussp_1
 	name = "leather USSP wallet"
 	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
 	icon = 'modular_bandastation/objects/icons/wallets.dmi'
@@ -16,7 +16,7 @@
 	worn_icon_state = "wallet_USSP_1"
 	overlay_icon_state = "wallet_USSP_1_overlay"
 
-/obj/item/storage/wallet/wallet_USSP_2
+/obj/item/storage/wallet/ussp_2
 	name = "leather USSP wallet"
 	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
 	icon = 'modular_bandastation/objects/icons/wallets.dmi'
@@ -25,7 +25,7 @@
 	worn_icon_state = "wallet_USSP_2"
 	overlay_icon_state = "wallet_USSP_2_overlay"
 
-/obj/item/storage/wallet/wallet_wyci
+/obj/item/storage/wallet/wyci
 	name = "W.Y.C.I. wallet"
 	desc = "Кошелек, законодателя моды WYCI,\
 	украшен золотой пуговицей cшит позолочеными и платиновыми нитями, сверх прочный.\

From 2c3f6fa6113fe05d44091323e8579106b5aa02c8 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 18:59:16 +0800
Subject: [PATCH 09/11] Grammar

---
 modular_bandastation/objects/code/hampters.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm
index 06db2b38ec98b..9b48ab1be4b14 100644
--- a/modular_bandastation/objects/code/hampters.dm
+++ b/modular_bandastation/objects/code/hampters.dm
@@ -19,7 +19,7 @@
 	. = ..()
 	if(user.combat_mode == TRUE)
 		new /obj/effect/decal/cleanable/blood(get_turf(user))
-		user.visible_message(span_warning("[user] раздавил хамптера в своей руке!"), span_warning("Ты с особой жестокостью давишь хамптера в своей руке, оставляя от него лишь лужу крови!"))
+		user.visible_message(span_warning("[user] раздавил хамптера своей рукой!"), span_warning("Ты с особой жестокостью давишь хамптера в своей руке, оставляя от него лишь лужу крови!"))
 		qdel(src)
 
 /obj/item/toy/plush/hampter/assistant

From e496b022b2ebe848a546aa47b1a2dc8787e1e8c0 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 19:01:27 +0800
Subject: [PATCH 10/11] Another one text change

---
 modular_bandastation/objects/code/hampters.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm
index 9b48ab1be4b14..3b485d2c93951 100644
--- a/modular_bandastation/objects/code/hampters.dm
+++ b/modular_bandastation/objects/code/hampters.dm
@@ -19,7 +19,7 @@
 	. = ..()
 	if(user.combat_mode == TRUE)
 		new /obj/effect/decal/cleanable/blood(get_turf(user))
-		user.visible_message(span_warning("[user] раздавил хамптера своей рукой!"), span_warning("Ты с особой жестокостью давишь хамптера в своей руке, оставляя от него лишь лужу крови!"))
+		user.visible_message(span_warning("[user] раздавил хамптера своей рукой!"), span_warning("Вы с особой жестокостью давите хамптера в своей руке, оставляя от него лишь лужу крови!"))
 		qdel(src)
 
 /obj/item/toy/plush/hampter/assistant

From dc30c7496febe18b754f1c1a51f7e7e8e3870ac3 Mon Sep 17 00:00:00 2001
From: Chorden523 <130075022+Chorden523@users.noreply.github.com>
Date: Tue, 23 Jul 2024 19:11:39 +0800
Subject: [PATCH 11/11] plush - suqeeze

---
 modular_bandastation/objects/code/hampters.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm
index 3b485d2c93951..94c5300f7260b 100644
--- a/modular_bandastation/objects/code/hampters.dm
+++ b/modular_bandastation/objects/code/hampters.dm
@@ -10,12 +10,12 @@
 	worn_icon_state = "hampter"
 	slot_flags = ITEM_SLOT_HEAD
 	w_class = WEIGHT_CLASS_TINY
-	COOLDOWN_DECLARE(plush_cooldown)
+	COOLDOWN_DECLARE(squeeze_cooldown)
 
 /obj/item/toy/plush/hampter/attack_self(mob/living/carbon/human/user)
-	if(!COOLDOWN_FINISHED(src, plush_cooldown))
+	if(!COOLDOWN_FINISHED(src, squeeze_cooldown))
 		return
-	COOLDOWN_START(src, plush_cooldown, 2 SECONDS)
+	COOLDOWN_START(src, squeeze_cooldown, 2 SECONDS)
 	. = ..()
 	if(user.combat_mode == TRUE)
 		new /obj/effect/decal/cleanable/blood(get_turf(user))