From 4d7acee855f7d91baf5598b59d1c88688a077fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Sun, 21 Jul 2024 16:02:53 +0300
Subject: [PATCH 01/10] Add new highrisk to quartermaster

---
 .../WeaponRandom/WeaponRandomComponent.cs     |   2 +-
 .../Weapons/brassKnukles/attributions.yml     |   4 ++
 .../Weapons/brassKnukles/critical-hit.ogg     | Bin 0 -> 14134 bytes
 .../ru-RU/ss220/weapons/brass_knuckles.ftl    |   2 +
 .../Entities/Weapons/Melee/brass_knuckles.yml |  37 ++++++++++++++++++
 .../brass_knuckles.rsi/equipped-HAND.png      | Bin 0 -> 287 bytes
 .../Weapons/Melee/brass_knuckles.rsi/icon.png | Bin 0 -> 369 bytes
 .../Melee/brass_knuckles.rsi/inhand-left.png  | Bin 0 -> 271 bytes
 .../Melee/brass_knuckles.rsi/inhand-right.png | Bin 0 -> 287 bytes
 .../Melee/brass_knuckles.rsi/meta.json        |  26 ++++++++++++
 10 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml
 create mode 100644 Resources/Audio/SS220/Weapons/brassKnukles/critical-hit.ogg
 create mode 100644 Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
 create mode 100644 Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
 create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/equipped-HAND.png
 create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png
 create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png
 create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png
 create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json

diff --git a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
index ef15498a700563..4ee5212ae7176e 100644
--- a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
+++ b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
@@ -16,7 +16,7 @@ internal sealed partial class WeaponRandomComponent : Component
     /// <summary>
     /// Chance for the damage bonus to occur (1 = 100%).
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("randomDamageChance"), ViewVariables(VVAccess.ReadWrite)] // SS220 add DataField
     public float RandomDamageChance = 0.00001f;
 
     /// <summary>
diff --git a/Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml b/Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml
new file mode 100644
index 00000000000000..e25fb0f8cb710b
--- /dev/null
+++ b/Resources/Audio/SS220/Weapons/brassKnukles/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["critical-hit.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Modified by kirus59 (Github), converted to OGG."
+  source: "https://wiki.teamfortress.com/wiki/Category:Sound_cues"
diff --git a/Resources/Audio/SS220/Weapons/brassKnukles/critical-hit.ogg b/Resources/Audio/SS220/Weapons/brassKnukles/critical-hit.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..49a8585cef4a386377a6fccccc5145ad53b74d45
GIT binary patch
literal 14134
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
I2>e(0Ki7r>xBvhE

literal 0
HcmV?d00001

diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
new file mode 100644
index 00000000000000..28f20aeb26fe6f
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
@@ -0,0 +1,2 @@
+ent-BrassKnuckles = гравированый кастет
+   .desc = Оружие, излюбленное специалистами синдиката, предпочитающими работать скрытно.
diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
new file mode 100644
index 00000000000000..8f1b982a0ffaa8
--- /dev/null
+++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
@@ -0,0 +1,37 @@
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+- type: entity
+  name: brass knuckles
+  parent: BaseItem
+  id: BrassKnuckles
+  description: кастет
+  components:
+  - type: Sprite
+    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    state: icon
+  - type: Clothing
+    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    slots: [gloves]
+  - type: Item
+    size: Small
+    storedRotation: -90
+  - type: MeleeWeapon
+    autoAttack: true
+    attackRate: 1
+    damage:
+      types:
+       Blunt: 10
+       Stamina: 28
+    soundHit:
+      collection: GenericHit
+    animation: WeaponArcFist
+    mustBeEquippedToUse: true
+  - type: WeaponRandom
+    damageBonus:
+        types:
+            Blunt: 10
+            Stamina: 72 # 28 + 72 = 100 => куклу без стаминрезиста сразу ложит в стаминкрит
+    randomDamageChance: 0.2
+    damageSound: /Audio/SS220/Weapons/brassKnukles/critical-hit.ogg
+  - type: StaticPrice
+    price: 1000
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/equipped-HAND.png b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/equipped-HAND.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dfed123130ff911d902e904942a61eb389f8a1f
GIT binary patch
literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn;{G-rC69Y#_iI;C3=9
zQe8V`O^N0V1?46CPk7`BoLwl~x759v=f|JFKI!`1-3*LOEF1y~4h?X|frSTN7j_>O
zum85eCcS2!;Qj9+liz1w{Iu=P-r8SsuWM)5cy7F``APQoqOE^^-rFsw>RM*HKI7c1
z-(1qkC<ehzgfb?GXx#7i@3VjM+3e-MzcwldUO1-P8V9`E_Lo((o!={1(+%zj1?3OS
r=eBq?ZmC|D4D=UYYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKq26I%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4684d65499e8552742dff70fb29655dfc75fbd95
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFv@wlIEF-Uz76r@J7mD~M!JIW
z{;TpIOzCk)*0$f9SmE^E?Qxn?@=UYXJPA%q$$r~&Dp}W`>dShtUurB#XlDMjuiK|N
zL#Em>vn4m<rr**FpUXu5q`rCXxXkgpSoZr}2cBr|74Qz(&{6$n^)?Gvzu=VSs#{6B
z_1W|f8I-Kmz5cASyV^`)<*jVL!-@x0`z3xH*<vO!<)^`|WhxB8jGsB`6W1j6{4x}G
z<1)-_jq5-Chv9f!i7l_x#%p^w&)NFssz|o-oLh76a7D(&vhyikSIO}dNqX`(XvL#c
zkE7id#XZ~JzuU?saobQ}<1W1$c@wuf?c?3`a6S9)t#a+3s*-FrJ;-Hn{x`wFd*lBD
z2Y8cozb-G-=&FdioHK=Q33L6+1MF|E3Ix6SW6BB)Fuv3X&op0O1}z|)1BgN3Qt)ID
N<>~6@vd$@?2>=+KnJ54N

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b89ab1a58655e7b65f775535ad7c409cf39a821
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dpunnLn;{G-rC69V!*>1;FhR+
zZKtTjYb!3b9fB`vy(UgNWhnF^LrL-H@k-6dnV$p|92yuHnOHak;0zDW8vEiUOnzOf
zi~P5p{@a(_{bQ}OLX_X>)1@VarTJFhRIgU7mhY_8bpG~X@6A9<+w)%NM!?MiF&d+}
z?quaH@Y-R&aKBjc6&t6ktW%$FlWe+vuWsi$UYN!HqCc1)uJLNz_`Pux&>wuM5uRzj
az6@GGHU|)cz@^~HAj;F#&t;ucLK6UgD^{TZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dfed123130ff911d902e904942a61eb389f8a1f
GIT binary patch
literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn;{G-rC69Y#_iI;C3=9
zQe8V`O^N0V1?46CPk7`BoLwl~x759v=f|JFKI!`1-3*LOEF1y~4h?X|frSTN7j_>O
zum85eCcS2!;Qj9+liz1w{Iu=P-r8SsuWM)5cy7F``APQoqOE^^-rFsw>RM*HKI7c1
z-(1qkC<ehzgfb?GXx#7i@3VjM+3e-MzcwldUO1-P8V9`E_Lo((o!={1(+%zj1?3OS
r=eBq?ZmC|D4D=UYYJ_K+uP=iZkj(+aAaE&oGKlhY^>bP0l+XkKq26I%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json
new file mode 100644
index 00000000000000..d6658782ccae3d
--- /dev/null
+++ b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/ss220club/Paradise-SS220/blob/master/icons/obj/weapons/knuckleduster.dmi, modifided by okroshka59 (Discord) from SS220",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

From 5fb91061c76d65cf3b2525bfdfc9959f0cbb762e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Sun, 21 Jul 2024 16:48:03 +0300
Subject: [PATCH 02/10] Add Steal objective

---
 .../Locale/ru-RU/ss220/weapons/brass_knuckles.ftl    |  2 +-
 Resources/Prototypes/Objectives/objectiveGroups.yml  |  1 +
 .../Prototypes/Objectives/stealTargetGroups.yml      |  9 +++++++++
 Resources/Prototypes/Objectives/traitor.yml          | 12 ++++++++++++
 .../SS220/Entities/Weapons/Melee/brass_knuckles.yml  |  4 +++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
index 28f20aeb26fe6f..47230904fc6be3 100644
--- a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
+++ b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
@@ -1,2 +1,2 @@
-ent-BrassKnuckles = гравированый кастет
+ent-BrassKnucklesEtchedQm = гравированный кастет
    .desc = Оружие, излюбленное специалистами синдиката, предпочитающими работать скрытно.
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 1c258ad81f3dd0..678b93be043ecb 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -18,6 +18,7 @@
     MagbootsStealObjective: 1
     CorgiMeatStealObjective: 1
     ClipboardStealObjective: 1
+    BrassKnucklesEtchedObjective: 1  #SS220 New Qm highrisk
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index f5af5c75c7df34..bfc7b58749d18b 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -49,6 +49,15 @@
     sprite: Objects/Misc/qm_clipboard.rsi
     state: qm_clipboard
 
+#SS220 New Qm highrisk begin
+- type: stealTargetGroup
+  id: BrassKnucklesEtchedQm
+  name: engraved brass knuckles
+  sprite:
+    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    state: icon
+#SS220 New Qm highrisk end
+
 - type: stealTargetGroup
   id: FoodMeatCorgi
   name: prime-cut corgi meat
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index ad5f56a443eae0..70b56af26865a9 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -231,6 +231,18 @@
     stealGroup: BoxFolderQmClipboard
     owner: job-name-qm
 
+#SS220 New Qm highrisk begin
+- type: entity
+  parent: BaseTraitorStealObjective
+  id: BrassKnucklesEtchedObjective
+  components:
+  - type: NotJobRequirement
+    job: Quartermaster
+  - type: StealCondition
+    stealGroup: BrassKnucklesEtchedQm
+    owner: job-name-qm
+#SS220 New Qm highrisk end
+
 ## hop
 
 - type: entity
diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
index 8f1b982a0ffaa8..96e34c54942a81 100644
--- a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
+++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
@@ -3,7 +3,7 @@
 - type: entity
   name: brass knuckles
   parent: BaseItem
-  id: BrassKnuckles
+  id: BrassKnucklesEtchedQm
   description: кастет
   components:
   - type: Sprite
@@ -35,3 +35,5 @@
     damageSound: /Audio/SS220/Weapons/brassKnukles/critical-hit.ogg
   - type: StaticPrice
     price: 1000
+  - type: StealTarget
+    stealGroup: BrassKnucklesEtchedQm

From 7713a378526c5f88a0fa416dd21083b036bfee48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Sun, 21 Jul 2024 16:51:30 +0300
Subject: [PATCH 03/10] moved to SS220

---
 .../Prototypes/Objectives/stealTargetGroups.yml      |  9 ---------
 Resources/Prototypes/Objectives/traitor.yml          | 12 ------------
 .../SS220/Objectives/stealTargetGroups.yml           |  9 ++++++++-
 Resources/Prototypes/SS220/Objectives/traitor.yml    | 11 +++++++++++
 4 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 Resources/Prototypes/SS220/Objectives/traitor.yml

diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index bfc7b58749d18b..f5af5c75c7df34 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -49,15 +49,6 @@
     sprite: Objects/Misc/qm_clipboard.rsi
     state: qm_clipboard
 
-#SS220 New Qm highrisk begin
-- type: stealTargetGroup
-  id: BrassKnucklesEtchedQm
-  name: engraved brass knuckles
-  sprite:
-    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
-    state: icon
-#SS220 New Qm highrisk end
-
 - type: stealTargetGroup
   id: FoodMeatCorgi
   name: prime-cut corgi meat
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 70b56af26865a9..ad5f56a443eae0 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -231,18 +231,6 @@
     stealGroup: BoxFolderQmClipboard
     owner: job-name-qm
 
-#SS220 New Qm highrisk begin
-- type: entity
-  parent: BaseTraitorStealObjective
-  id: BrassKnucklesEtchedObjective
-  components:
-  - type: NotJobRequirement
-    job: Quartermaster
-  - type: StealCondition
-    stealGroup: BrassKnucklesEtchedQm
-    owner: job-name-qm
-#SS220 New Qm highrisk end
-
 ## hop
 
 - type: entity
diff --git a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
index 8508c424363e4a..265965a65203ca 100644
--- a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
@@ -3,4 +3,11 @@
   name: secway
   sprite:
     sprite: Objects/Vehicles/secway.rsi
-    state: icon
\ No newline at end of file
+    state: icon
+
+- type: stealTargetGroup
+  id: BrassKnucklesEtchedQm
+  name: engraved brass knuckles
+  sprite:
+    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    state: icon
diff --git a/Resources/Prototypes/SS220/Objectives/traitor.yml b/Resources/Prototypes/SS220/Objectives/traitor.yml
new file mode 100644
index 00000000000000..8a72ec5c5b95e0
--- /dev/null
+++ b/Resources/Prototypes/SS220/Objectives/traitor.yml
@@ -0,0 +1,11 @@
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+- type: entity
+  parent: BaseTraitorStealObjective
+  id: BrassKnucklesEtchedObjective
+  components:
+  - type: NotJobRequirement
+    job: Quartermaster
+  - type: StealCondition
+    stealGroup: BrassKnucklesEtchedQm
+    owner: job-name-qm

From be24b6c154046837a88e6ef10a04e3711a350d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Sun, 21 Jul 2024 17:03:20 +0300
Subject: [PATCH 04/10] Fix meta

---
 .../SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json
index d6658782ccae3d..776963ab612a4c 100644
--- a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json
+++ b/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/ss220club/Paradise-SS220/blob/master/icons/obj/weapons/knuckleduster.dmi, modifided by okroshka59 (Discord) from SS220",
+    "copyright": "Taken from https://github.com/ss220club/Paradise-SS220/blob/master/icons/obj/weapons/knuckleduster.dmi, modifided by okroshka59 (Discord) for SS220",
     "size": {
         "x": 32,
         "y": 32

From 52364a174b61932d518249b6f532c9c0c9332af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Sat, 27 Jul 2024 14:00:27 +0300
Subject: [PATCH 05/10] Add glass case

---
 Resources/Locale/ru-RU/ss220/misc/case.ftl    |   6 ++
 .../ru-RU/ss220/weapons/brass_knuckles.ftl    |   4 +-
 .../Prototypes/Objectives/objectiveGroups.yml |   2 +-
 .../SS220/Entities/Objects/Misc/case.yml      |  61 ++++++++++++++++++
 .../Entities/Weapons/Melee/brass_knuckles.yml |  12 ++--
 .../SS220/Objectives/stealTargetGroups.yml    |   2 +-
 .../Prototypes/SS220/Objectives/traitor.yml   |   4 +-
 Resources/Prototypes/SS220/tags.yml           |   6 +-
 .../caplaser.png                              | Bin 0 -> 557 bytes
 .../etched_brass_knuckles_case.rsi/icon.png   | Bin 0 -> 355 bytes
 .../etched_brass_knuckles_case.rsi/locked.png | Bin 0 -> 146 bytes
 .../etched_brass_knuckles_case.rsi/meta.json  |  26 ++++++++
 .../etched_brass_knuckles_case.rsi/open.png   | Bin 0 -> 406 bytes
 .../unlocked.png                              | Bin 0 -> 146 bytes
 .../equipped-HAND.png                         | Bin
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 19 files changed, 112 insertions(+), 11 deletions(-)
 create mode 100644 Resources/Locale/ru-RU/ss220/misc/case.ftl
 create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/caplaser.png
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png
 rename Resources/Textures/SS220/Objects/Weapons/Melee/{brass_knuckles.rsi => etched_brass_knuckles.rsi}/equipped-HAND.png (100%)
 rename Resources/Textures/SS220/Objects/Weapons/Melee/{brass_knuckles.rsi => etched_brass_knuckles.rsi}/icon.png (100%)
 rename Resources/Textures/SS220/Objects/Weapons/Melee/{brass_knuckles.rsi => etched_brass_knuckles.rsi}/inhand-left.png (100%)
 rename Resources/Textures/SS220/Objects/Weapons/Melee/{brass_knuckles.rsi => etched_brass_knuckles.rsi}/inhand-right.png (100%)
 rename Resources/Textures/SS220/Objects/Weapons/Melee/{brass_knuckles.rsi => etched_brass_knuckles.rsi}/meta.json (100%)

diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl
new file mode 100644
index 00000000000000..e87073c47c1ffb
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/misc/case.ftl
@@ -0,0 +1,6 @@
+ent-GlassCase = стеклянный кейс
+   .desc = пупупу
+
+ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс
+   .desc = Гравированный кастет Квартирмейстера, сделанный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями воровства личных вещей и материалов из отдела снабжения.
+   .suffix = Гравированный кастет, Заполненый
diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
index 47230904fc6be3..58b3c5d9c77a2c 100644
--- a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
+++ b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
@@ -1,2 +1,2 @@
-ent-BrassKnucklesEtchedQm = гравированный кастет
-   .desc = Оружие, излюбленное специалистами синдиката, предпочитающими работать скрытно.
+ent-EtchedBrassKnuckles = гравированный кастет
+   .desc = Гравированный кастет Квартирмейстера, сделанный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями воровства личных вещей и материалов из отдела снабжения.
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 678b93be043ecb..313a9f200c5e72 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -18,7 +18,7 @@
     MagbootsStealObjective: 1
     CorgiMeatStealObjective: 1
     ClipboardStealObjective: 1
-    BrassKnucklesEtchedObjective: 1  #SS220 New Qm highrisk
+    EtchedBrassKnucklesStealObjective: 1  #SS220 New Qm highrisk
     CaptainGunStealObjective: 0.5
     CaptainJetpackStealObjective: 0.5
     HandTeleporterStealObjective: 0.5
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
new file mode 100644
index 00000000000000..e5a2d3ad2c012a
--- /dev/null
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
@@ -0,0 +1,61 @@
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+- type: entity
+  parent: [BaseItem, BaseItemCabinet]
+  id: GlassCase
+  name: glass case
+  suffix: Etched brass knuckles
+  description: Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника".
+  components:
+  - type: Item
+    size: Large
+  - type: Lock
+  - type: LockVisuals
+  - type: Sprite
+    sprite: SS220/Misc/etched_brass_knuckles_case.rsi
+    layers:
+    - state: icon
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: open
+      map: ["enum.OpenableVisuals.Layer"]
+    - state: caplaser
+      map: ["enum.ItemCabinetVisuals.Layer"]
+      visible: true
+    - state: locked
+      shader: unshaded
+      map: ["enum.LockVisualLayers.Lock"]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ItemCabinetVisuals.ContainsItem:
+        enum.ItemCabinetVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: { state: open }
+          False: { state: icon }
+  - type: StaticPrice
+    price: 100
+
+- type: entity
+  parent: GlassCase
+  id: GlassCaseEtchedBrassKnucklesFilled
+  name: glass case
+  suffix: Etched brass knuckles
+  description: Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника".
+  components:
+  - type: AccessReader
+    access: [["Quartermaster"]]
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        ejectOnInteract: true
+        whitelist:
+          tags:
+          - EtchedBrassKnuckles
+        ejectSound: /Audio/Machines/machine_switch.ogg
+  - type: ContainerFill
+    containers:
+      ItemCabinet:
+      - EtchedBrassKnuckles
diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
index 96e34c54942a81..f56e2e24f6d8d9 100644
--- a/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
+++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/brass_knuckles.yml
@@ -1,16 +1,17 @@
 # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 
+#Quartermaster
 - type: entity
   name: brass knuckles
   parent: BaseItem
-  id: BrassKnucklesEtchedQm
+  id: EtchedBrassKnuckles
   description: кастет
   components:
   - type: Sprite
-    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
     state: icon
   - type: Clothing
-    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
     slots: [gloves]
   - type: Item
     size: Small
@@ -33,7 +34,10 @@
             Stamina: 72 # 28 + 72 = 100 => куклу без стаминрезиста сразу ложит в стаминкрит
     randomDamageChance: 0.2
     damageSound: /Audio/SS220/Weapons/brassKnukles/critical-hit.ogg
+  - type: Tag
+    tags:
+    - EtchedBrassKnuckles
   - type: StaticPrice
     price: 1000
   - type: StealTarget
-    stealGroup: BrassKnucklesEtchedQm
+    stealGroup: EtchedBrassKnuckles
diff --git a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
index 265965a65203ca..93af2cb4fa2840 100644
--- a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
@@ -6,7 +6,7 @@
     state: icon
 
 - type: stealTargetGroup
-  id: BrassKnucklesEtchedQm
+  id: EtchedBrassKnuckles
   name: engraved brass knuckles
   sprite:
     sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
diff --git a/Resources/Prototypes/SS220/Objectives/traitor.yml b/Resources/Prototypes/SS220/Objectives/traitor.yml
index 8a72ec5c5b95e0..330f44d2241efa 100644
--- a/Resources/Prototypes/SS220/Objectives/traitor.yml
+++ b/Resources/Prototypes/SS220/Objectives/traitor.yml
@@ -2,10 +2,10 @@
 
 - type: entity
   parent: BaseTraitorStealObjective
-  id: BrassKnucklesEtchedObjective
+  id: EtchedBrassKnucklesStealObjective
   components:
   - type: NotJobRequirement
     job: Quartermaster
   - type: StealCondition
-    stealGroup: BrassKnucklesEtchedQm
+    stealGroup: EtchedBrassKnuckles
     owner: job-name-qm
diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml
index 635a8c3785d454..b702d683de50fa 100644
--- a/Resources/Prototypes/SS220/tags.yml
+++ b/Resources/Prototypes/SS220/tags.yml
@@ -84,4 +84,8 @@
   id: PowerCellHigh
 
 - type: Tag
-  id: WeaponFlareGun
\ No newline at end of file
+  id: WeaponFlareGun
+
+# New Qm highrisk
+- type: Tag
+  id: EtchedBrassKnuckles
diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/caplaser.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/caplaser.png
new file mode 100644
index 0000000000000000000000000000000000000000..4af9023cd0c9e802f602ee551d0e7ec7dfcc2a4d
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$=Sf6CR9J=WlTT|CK^Vq=>29+5BPb+`7&bzWOAnp`dyYb}x#=PViv=NIzeFxl
zsP+TYFX2H$D_&cuduTmbHyR?ihDJ#sm;|$%C60%h;Kl96i<kW!XP$Z9cb<0!A|fIp
zA{L-pt%^#eB7!ugX^K**6sY+VIjr#E#se{(cmN#3yuhcc1pv;zeF5N&BrzNgF$_bf
zs!F|Hj|KS#ZqB&9x+*;1M+iYOksy`11c2{Ph{qH7{)BWo4M4x&XD}ErolcP?3Cpqq
zYlKNa+%U>aCf`XUF3%U23whpu_)04MljTC5dv|ZrY&1~PNdQ{S7LT{KE;J7{f)~$C
z?00!u%_fbHO*HKqqrnhG9s%(3)oau%zZ<)*v7{&{sq;iMO%v^Q`>!d48G+c_+XuiK
z|KN^kVi*PhmSv%;D&1}ufZg3^bUJ6OtmtfSKSh>hI-L$d4TMP`RxYp2A6>Cn#Pd8{
z*PUHJ%r3II`AF1iHR4hnS(ZsEN?`Gs!9wV|E_%HlqtS@*csxJ9zJ6aE92^3W&1P|3
z7u&Wk^bh?F!{Rtj%yFF1`lSW^g>Bp9aye90h4c8ut+fqta`Ki;CbOX3;t9lbT^9g5
vJ5M-0wE;Lf{)}zg@DC%6h=_=Y`0xAz<}t3-?nQhm00000NkvXXu0mjfwPNxI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..474dbfa26561b887a4374a2b918602d7a1eb9ff2
GIT binary patch
literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<%$_ceArY;~
z2@<S}6GVEN0u8v_4r+in4UEc$T{Sf||F~~2F%`^yaa(!wt8F<qou=H>IiivDd~y;;
z`II%g3sUSIx3Zb_@f7QO3MT7(<Vyg7|9@vYez+XI=*mQ<j<N&xY;0_LVre29`Ro4~
zaV+Tkt9-IbNTwkDyC2){84_%2D%~?CWX!m6P}O_I`-boG5t4qf^@j=+w#&Kx5ocy*
zmYx-*XXn@UJ>Fu)>xTIH|AqxdMg|)U1;b9C;Ry5(WuNha+c?JZ@1(}o#@P#Q+25Cx
z@bPJt?0d6h5%Z$TX$CWVwx%RJ*qpRs!^*=e-yNB##@6P4T;klCn`aFgEq=Q*GBf<H
pcXZlqIc*{^Z1_?mJkxxA8MJ_G4j=}BOTm*tl&7no%Q~loCIC$^gn9q~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..c44739897039c7e204647fd2d7c049ff49dfa185
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MxHK?ArY-_
z&lvJDC<w3|Jj}>>PoUFWNXAAkBO~qCT^67kyX^H3z1B~hHuuz-%6|onu|HXvLINxf
i0cH47BRtc5eHpZXYz`m>flI-YL6oPfpUXO@geCxo<tFC<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
new file mode 100644
index 00000000000000..634a5ed0513b35
--- /dev/null
+++ b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
+    "copyright": "Made by okroshka59 (Discord) for SS220",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        },
+        {
+            "name": "caplaser"
+        }
+    ]
+}
diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a935068e302fb80339a08c30273606fea06fb5e
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<W}YsNArY;~
z2@<S}6GVEN0u8v_tP)h*Ce~&gw+rI6+p+6Vr$njF5vhzv`NcoZPA+G;+IfP*aL&z&
zBhw;^XLf{oXgh>(Xh>wsmR%7SH|*Y2ro80am8;gf@7Y|mswprPl|29i3Yuzf3SPaM
z8+&9$aza9c^O~K^a;(hn7#1yh@OENk>0}9sSsf<DXKyQSekCCx@v1Y>C&co>I^D1H
zJx)JNcz!kAWu|Y5(v^x2JsGF-H9Q2@PRn4g`FH-nf>S5^l*)ep_Ft2<gkh2Ffzv>T
zO&5Hq5R+t5c;N7U0jZq^bsSp-B6|uFecPDrYW|*6IO{U!z1{!xgdM-WT3_T-SS4ez
z@oe+MyY?LqTR!Zr7x;RFX_3=|GqWD^ygu)0Wbh%<Fyh9Qhh;A&s<E~CAD1|{#?o&K
vvl}DB^Z&W|j+;5Wfx*d_8sVAd>&u`8WOD#92wV!D45B<;{an^LB{Ts5-0-Hq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c746b2ab9a308583bef839aeb8499d5fc9a2dc0
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}MxHK?ArY-_
z&loZ?DDWKE@a`z{q=0S}n>Vs@-wH1L(e;?5;yI~K{BA*>7F)=n$iMybc0a3OWxA2F
k#1W{QFEzq5&DWPf3&`dGVi33#JQ+lJy85}Sb4q9e0DLYgKL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/equipped-HAND.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/equipped-HAND.png
rename to Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png
similarity index 100%
rename from Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png
rename to Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png
rename to Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png
rename to Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json
similarity index 100%
rename from Resources/Textures/SS220/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json
rename to Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json

From a3850a84d4b03abc2754be9124818f118edb95ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Tue, 6 Aug 2024 16:25:34 +0300
Subject: [PATCH 06/10] Some prototype and sprite changes

---
 Resources/Locale/ru-RU/ss220/misc/case.ftl    |   5 +-
 .../SS220/Entities/Objects/Misc/case.yml      |  55 +++++++++++++-----
 .../etched_brass_knuckles_case.rsi/base.png   | Bin 0 -> 258 bytes
 .../brassknukles.png                          | Bin 0 -> 184 bytes
 .../caplaser.png                              | Bin 557 -> 0 bytes
 .../etched_brass_knuckles_case.rsi/closed.png | Bin 0 -> 210 bytes
 .../etched_brass_knuckles_case.rsi/locked.png | Bin 146 -> 142 bytes
 .../etched_brass_knuckles_case.rsi/meta.json  |   8 ++-
 .../etched_brass_knuckles_case.rsi/open.png   | Bin 406 -> 211 bytes
 .../unlocked.png                              | Bin 146 -> 142 bytes
 10 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png
 delete mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/caplaser.png
 create mode 100644 Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png

diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl
index e87073c47c1ffb..600723c6b87e92 100644
--- a/Resources/Locale/ru-RU/ss220/misc/case.ftl
+++ b/Resources/Locale/ru-RU/ss220/misc/case.ftl
@@ -1,6 +1,7 @@
 ent-GlassCase = стеклянный кейс
-   .desc = пупупу
+   .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла с основанием из выращенного на тропических планетах дерева и украшенная бархатной подушкой, для предотвращения возможных царапин. 
+   .suffix = Гравированный кастет
 
 ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс
-   .desc = Гравированный кастет Квартирмейстера, сделанный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями воровства личных вещей и материалов из отдела снабжения.
+   .desc = { ent-GlassCase.desc }
    .suffix = Гравированный кастет, Заполненый
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
index e5a2d3ad2c012a..821e719b662da7 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
@@ -5,7 +5,7 @@
   id: GlassCase
   name: glass case
   suffix: Etched brass knuckles
-  description: Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника".
+  description: Made to order for storing valuables. The lid is made of tempered glass, and the base is made of wood grown on tropical planets and decorated with a velvet pad to prevent possible scratches.
   components:
   - type: Item
     size: Large
@@ -14,17 +14,25 @@
   - type: Sprite
     sprite: SS220/Misc/etched_brass_knuckles_case.rsi
     layers:
-    - state: icon
+    - state: base
       map: ["enum.StorageVisualLayers.Base"]
-    - state: open
+    - state: closed
       map: ["enum.OpenableVisuals.Layer"]
-    - state: caplaser
+    - state: brassknukles
       map: ["enum.ItemCabinetVisuals.Layer"]
       visible: true
     - state: locked
       shader: unshaded
       map: ["enum.LockVisualLayers.Lock"]
   - type: Appearance
+  - type: ItemSlots
+    slots:
+      ItemCabinet:
+        ejectOnInteract: true
+        whitelist:
+          tags:
+          - EtchedBrassKnuckles
+        ejectSound: /Audio/Machines/machine_switch.ogg
   - type: GenericVisualizer
     visuals:
       enum.ItemCabinetVisuals.ContainsItem:
@@ -34,7 +42,33 @@
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
           True: { state: open }
-          False: { state: icon }
+          False: { state: closed }
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 80
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassReinforced:
+            min: 1
+            max: 2
+      # - !type:ChangeConstructionNodeBehavior
+      #   node: brokenGlassBox
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
   - type: StaticPrice
     price: 100
 
@@ -42,19 +76,10 @@
   parent: GlassCase
   id: GlassCaseEtchedBrassKnucklesFilled
   name: glass case
-  suffix: Etched brass knuckles
-  description: Ударопрочный кейс с замком для хранения револьвера. Является аксессуаром к сувенирному револьверу "Уника".
+  suffix: Etched brass knuckles, Filled
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
-  - type: ItemSlots
-    slots:
-      ItemCabinet:
-        ejectOnInteract: true
-        whitelist:
-          tags:
-          - EtchedBrassKnuckles
-        ejectSound: /Audio/Machines/machine_switch.ogg
   - type: ContainerFill
     containers:
       ItemCabinet:
diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbe6e6e75c5e3bc53a75ce3562e56188a087722c
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ^`0({ArYL(2@<S}6%C}Aun{gT
z4ZF8psSh#~JSMcBC8g5NocW@}l6e)EI|De43_80X*6%j3<~pY8Cd}U8#E_z>qmqy#
z(W~Px%+69^@W=i5xi>SC6ih?P8+JA+biGep*wD+?%Hd%vXz0CX(*Ns92luf{`f)Tn
zF+hy0+~vub^Wwky<b(T|e+o#moov=&U#WiRMxg2g0S1PnH<v00FF2G6bUI&ZglC$s
aFM}44%>l$9a4C2)i1Kvxb6Mw<&;$UH=TVdZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png
new file mode 100644
index 0000000000000000000000000000000000000000..45d060a310b6561799eeed2c293681e638d53aad
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR8JSjkO<D?1PRu~iUv|l*a-(W
zjz9HAKkYrFt$f=8mt<SsUBa;O&uLW=DK)=cohdJV{C|4s|NrYs|CKMNNI1_Fo6zsr
zw_x>o&Eiih-Z@G!G5E0?WT%8|`VX{_FEzq5&DWPf3&`dGVi33#JQ+lJy85}Sb4q9e
E0G6>h2mk;8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/caplaser.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/caplaser.png
deleted file mode 100644
index 4af9023cd0c9e802f602ee551d0e7ec7dfcc2a4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$=Sf6CR9J=WlTT|CK^Vq=>29+5BPb+`7&bzWOAnp`dyYb}x#=PViv=NIzeFxl
zsP+TYFX2H$D_&cuduTmbHyR?ihDJ#sm;|$%C60%h;Kl96i<kW!XP$Z9cb<0!A|fIp
zA{L-pt%^#eB7!ugX^K**6sY+VIjr#E#se{(cmN#3yuhcc1pv;zeF5N&BrzNgF$_bf
zs!F|Hj|KS#ZqB&9x+*;1M+iYOksy`11c2{Ph{qH7{)BWo4M4x&XD}ErolcP?3Cpqq
zYlKNa+%U>aCf`XUF3%U23whpu_)04MljTC5dv|ZrY&1~PNdQ{S7LT{KE;J7{f)~$C
z?00!u%_fbHO*HKqqrnhG9s%(3)oau%zZ<)*v7{&{sq;iMO%v^Q`>!d48G+c_+XuiK
z|KN^kVi*PhmSv%;D&1}ufZg3^bUJ6OtmtfSKSh>hI-L$d4TMP`RxYp2A6>Cn#Pd8{
z*PUHJ%r3II`AF1iHR4hnS(ZsEN?`Gs!9wV|E_%HlqtS@*csxJ9zJ6aE92^3W&1P|3
z7u&Wk^bh?F!{Rtj%yFF1`lSW^g>Bp9aye90h4c8ut+fqta`Ki;CbOX3;t9lbT^9g5
vJ5M-0wE;Lf{)}zg@DC%6h=_=Y`0xAz<}t3-?nQhm00000NkvXXu0mjfwPNxI

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..25a65ee1a72df652d2f6035033622bfc30d61b0e
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJdQTU}kO<D?1PRu~iUv|ln1qOv
z!oK8S<&`s5{bP#U_w>`-mAmC?BfL49uQXl>zRQ>%zi&5}(HsG`mD2P07=He_y8r)n
z&cs<RjkOua_dQZ|@9^qSC{_3x;>)bS?0J&aq>$l6K#)PGbHWvas5S-$y<;4)N&zdb
j0G+~@8sVAd>&u`8WOD#92wV!D45B<;{an^LB{Ts5lr=zz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png
index c44739897039c7e204647fd2d7c049ff49dfa185..8440581c713c9340b065ba491faf0207411074d8 100644
GIT binary patch
delta 78
zcmbQl*vB|Q#l_mw#W5s;^X&ykUIqmo<^x^~|M@;NY@4_<;pErL`PH2Q3Jwhnj7%&X
gU`FFgCiT^MWu^XqKOBF@zBQWFVY!mJ!o(ak08pD8!~g&Q

delta 82
zcmV-Y0ImOy0g?fbBuD{sQb$4nuFf3k0000oNkl<ZScUD(F%1A95Cp-)0SVp^i8m4)
oJRWFhX8PR(0000!Yp>x-uaTCW%FKEGZ~<NU1p-u1IKq)=CS?2_t^fc4

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
index 634a5ed0513b35..f58b59c9749439 100644
--- a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
+++ b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
@@ -10,9 +10,15 @@
         {
             "name": "icon"
         },
+        {
+            "name": "base"
+        },
         {
             "name": "open"
         },
+        {
+            "name": "closed"
+        },
         {
             "name": "locked"
         },
@@ -20,7 +26,7 @@
             "name": "unlocked"
         },
         {
-            "name": "caplaser"
+            "name": "brassknukles"
         }
     ]
 }
diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png
index 0a935068e302fb80339a08c30273606fea06fb5e..0a2f90f91f2d472dcfbc3e2051c1b1568a241334 100644
GIT binary patch
delta 149
zcmbQne3@~AN_~T;i(^OxXL5oB>taO%DJBHr($Y|yaojG*Q1F=0dX|*RkCT*pKg!PL
zNSa_Zq3V&Zy3^AJYlbJEb*Jb1*M5EfKi5fO3Ez@=9QA@g#Sd;yf4{DYN4>@Im7A=?
wSAh>7KmO!5ni9bi<X^+mze<L;@uGkPZ{tKcE+&S{a_p)HmTs6hxqwj(0D%@dhX4Qo

delta 344
zcmV-e0jK`c0hR-hB!2;OQb$4nuFf3k0003tNkl<ZScPL?7zLwX6pVsVFbYOGU?fJ7
zeQ3u%QVl-1y26PVbu7dhXyR{k_|21d1l5Vi2r-=5c*K@ibD4-$NGm{82q+k99d^_g
z7cq;nb|a+r)YUt?-aOGdd~h`t9l*fAz#u6m>~QMpon6GJV}D>^SVOG210Dqf?f{~q
z;O&uFb(0tvnus)W&D$fh>KGUp>WNWIR5{?TE%l#B%i&<>)n`PRO>`pEc<_v9%Wo)1
z5v`VJ2Ymj|z@W;>jv{vZ`%kQ5qyVBFz{?0RoR<;dAY5WJalpgB5E{8Keh9S?S&VRD
zO@;$LeErTK%}zv|?>_%$V7U7AJJAjxsvJ16&4c0HKZxOk@VkEy^~3_ALg37r;|%N1
qMKUn(Sut4H)ZupMktPO)PsbR}tT|4!14aP==l^YQL9+-;k*y}9v!5CO

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png
index 5c746b2ab9a308583bef839aeb8499d5fc9a2dc0..73fcb9178f139d9cb1b44a459040d27f5c8057ae 100644
GIT binary patch
delta 78
zcmbQl*vB|Q#l_mw#W5s;^X-L&f(!~g%m;Lsepj1pp8A?Aw4=Y%>xjBj0|O%y3x|M$
g1DMgq^m@rR-%@`4GyeoC_FiSJOgqf_Y+{ZY01RLo<NyEw

delta 82
zcmV-Y0ImOy0g?fbBuD{sQb$4nuFf3k0000oNkl<ZScUD(F#!M|48XAN#RHO1izGbk
o9Uk^@(EKe(k|arzeiz+vZYl;;!dd-~p1bCJ1p?S)q(PBrCgd(51^@s6


From 06e9214bec16e190adb5b598ac0197804cba714a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Wed, 7 Aug 2024 19:19:08 +0300
Subject: [PATCH 07/10] Sprite update and add to Qm locker

---
 .../Prototypes/Catalog/Fills/Lockers/heads.yml  |   1 +
 .../SS220/Entities/Objects/Misc/case.yml        |   6 +++---
 .../SS220/Objectives/stealTargetGroups.yml      |   2 +-
 .../etched_brass_knuckles_case.rsi/base.png     | Bin 258 -> 320 bytes
 .../brassknukles.png                            | Bin 184 -> 189 bytes
 .../etched_brass_knuckles_case.rsi/closed.png   | Bin 210 -> 298 bytes
 .../etched_brass_knuckles_case.rsi/icon.png     | Bin 355 -> 387 bytes
 .../etched_brass_knuckles_case.rsi/locked.png   | Bin 142 -> 167 bytes
 .../etched_brass_knuckles_case.rsi/open.png     | Bin 211 -> 293 bytes
 .../etched_brass_knuckles_case.rsi/unlocked.png | Bin 142 -> 165 bytes
 10 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index accd1a7ebebf28..d928d6649ca970 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -22,6 +22,7 @@
       - id: ClothingHeadsetAltCargo
       - id: BoxEncryptionKeyCargo
       - id: ClothingWristWatchGold # SS220 Wrist Watch
+      - id: GlassCaseEtchedBrassKnucklesFilled # SS220 New Qm highrisk
 
 - type: entity
   id: LockerCaptainFilledHardsuit
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
index 821e719b662da7..4cfbaa0ce61a98 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
@@ -2,7 +2,7 @@
 
 - type: entity
   parent: [BaseItem, BaseItemCabinet]
-  id: GlassCase
+  id: GlassCaseEtchedBrassKnuckles
   name: glass case
   suffix: Etched brass knuckles
   description: Made to order for storing valuables. The lid is made of tempered glass, and the base is made of wood grown on tropical planets and decorated with a velvet pad to prevent possible scratches.
@@ -16,11 +16,11 @@
     layers:
     - state: base
       map: ["enum.StorageVisualLayers.Base"]
-    - state: closed
-      map: ["enum.OpenableVisuals.Layer"]
     - state: brassknukles
       map: ["enum.ItemCabinetVisuals.Layer"]
       visible: true
+    - state: closed
+      map: ["enum.OpenableVisuals.Layer"]
     - state: locked
       shader: unshaded
       map: ["enum.LockVisualLayers.Lock"]
diff --git a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
index 93af2cb4fa2840..49d5b7616d1362 100644
--- a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
@@ -9,5 +9,5 @@
   id: EtchedBrassKnuckles
   name: engraved brass knuckles
   sprite:
-    sprite: SS220/Objects/Weapons/Melee/brass_knuckles.rsi
+    sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
     state: icon
diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/base.png
index cbe6e6e75c5e3bc53a75ce3562e56188a087722c..2d2606c115910f6ddc7367e31cee5d01e8251795 100644
GIT binary patch
delta 265
zcmV+k0rvia0>A>0B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0002cNkl<ZSVv<R
z1*2dTjDk@x(0~z2;{@*7Qvab$lEKca&j^}Nlmj##JY)C_bOtX_HL>&!1u3E&zyzi7
z0+6Aqoa`jg!~&um0P@l8?>|YRi3LPCfR=zL2R!`C!0_%LX@4}afS?0DeErTK1XN|t
z&CVdtOdJhT57I{rAQ)T!uSNb3G+GWe6a+v%1hH|^Fg5GXMKUmIEhlI`K?SFq6#kop
zSTZp1Sut4H)ImjYgA+%Z7#KbsV>q+sID={30}_(sC>RB!U=)mkkqH<W0KUj{>6H^(
P)&Kwi4rN$LW|8C`)tG2p

delta 196
zcmX@W)WkGFrGCAqi(^OxXL5oB>taO%DJE=$OH0G<ZCC1p3<Zw~t!GK8v@>VED6wQ-
z#pTWbP9uZP?uYfe4XnA2sk#ZXH#jk*DC(#r<Vf`D_zSbM6d3$*KYs4bj3foqkn)C|
zO$uG_6Bjo0vbAz}*a{kY@3EZp|GLt_ee9Bc9L-J)5Hl-xc{1j__^&?s;6CP`0@7?J
fn|0V%svo)$sQN&Ff#K-QrOLqz4y8_(VpIbF;+#mN

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/brassknukles.png
index 45d060a310b6561799eeed2c293681e638d53aad..639254ff4ccc6c0f4c2438bc0f96ff7e13a22067 100644
GIT binary patch
delta 137
zcmdnNxR-H)N<Cw7kh>GZx^prw85kH?(j9#r85lP9bN@+X1@e78T^vIq+><3(7bl4H
zGzA)PxiMNk_&@pN|BV+*7?;l$QJ7Y@v&HG~k(W#k)Bf!j`zb%O&Fdn6Lk-WSIqU4?
k;kw!s6A~C0g31lDCkX{UU|?Y2OO5bM^YvxWnmA7i03#bQ6951J

delta 137
zcmdnXxPx(mN`0!Qi(^OxXL5oB>taO%DJJZMgB!=6dZVBA9@196ZGlU&E$=R2*!btP
zs)&@D->%M-7eD?#z4ZV8b*2Bxms2F1XNpbeckElR`n+cGrxouUrI;A}*bTB%LN@(p
XU|`@&jqptK^<~fkvN;$gt`G$P3wSZm

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/closed.png
index 25a65ee1a72df652d2f6035033622bfc30d61b0e..2b46f8f8e28b6d51dcd4a9f752db15513a4fe9fe 100644
GIT binary patch
delta 235
zcmV<H02Key0jdI!B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0002GNkl<ZSVv<R
z1*2dTjDk@x(0~z2;{-lFKL3Sn(wd-LqQToEv+A~N*+S5Kf(qh0HZ_KNYl^V(i%LL+
z2!dZ9U%yzr_4=EI6@K+lA)J5-O5+8RV!{p}Ly5&8^-!$@0bx-Npd}zW3e2=s+@L}P
z!Ktfvb`cu|1RY=>+Of~X-{$a}C-0ylgn@{R5W|^`M{EzSu5f}1;RHlQ0V$S)04eH;
l3IQmSWI#*^jDk@x3P!;w7zG0i7#IMvg<iJo{PZ%BtR^kkUs3=7

delta 148
zcmZ3*bcu0-N`1Yji(^OxXL5oB>taO%DJD!p#7SXaa<KBs8LR#=Meck0>Fvtha<viO
z9L-l6uLR#^Opo8Uo6Bg90NYCGd3+2%|6JYwe>-R5ESJXGjN|(rsk(P~btsf7d=2qs
oR$%r#$!b!_a3UbcAk;bGia}Hx11E#tF^*WJfE8CJvoNXw0MkG>ivR!s

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/icon.png
index 474dbfa26561b887a4374a2b918602d7a1eb9ff2..aa63a62dee73e836ce63d2f975c8457b1f908c1e 100644
GIT binary patch
delta 314
zcmV-A0mc5~0)qpPFn<69XF*Lt006O%3;baP0003KNkl<ZSVv<R1*2dTjDk@x3P!<*
z2aHe}C-Cv{`OnTL1?3SBetvq!uw}~@g60!c5FC~E-$hlDflXGKfd$C_1H^>rUytuH
z?797%VePV61kGoH(s+T2t2+bB^9KwcfCdvogVYlXh;jf((SL_Oe;L?_q=_;V3W$yZ
z`<NK8!T*4m5PfjT5~8DkpaLha?EmsSKN!A!`VJK#47m6>86JM&VA!{9D&=Y5*I%HY
zK7VJBVPj?x0IDX22B`<@BLV=m;0Gr9!VHgpa5G%}%)#*RJ2%5c0yIb+NIgg&F@RtY
zoo-V2ZxUk3z%RgO#b9Am2NlH)P8?}sVEA;5;mn%j45oDt2%0|%M!_f;V8Flt0Pd-Z
MCC2MkAd@`-Cavv;`2YX_

delta 282
zcmV+#0p<RK1LFdaFn<99Nkl<ZScPL?7zLwX6pVsVFbYP&C>RB!V1NN5F^YVAeEtjD
zq%{$1=-VT+>b7jzLX_Do#3*9tlVS*Wl&rgOWIsW*1~!fib1z8|V=VCwU|?WiVE_G_
zLGaU8qSTQBh<3m~1_lN$7G@N&4}bnL2%w4mBguLa9B^m%PJagbm>32oB#W4kXqec+
zB}=I9fcGC*8BSe)!f+tB9!2~Y0|Nsanp!SCPKNhiIH>D@Uw{8Ga56G5urU!<%ghK-
zPgMt)=nFGkIsKA>g@K!(+CSeJ7)(rs8IJ6vq64CNmN1x1wPax6vtqEYsl%!6#E~Wj
ghEK;B&aBzZFb{z^`$qu-0Q-MILc2MZk&|5kCRjOmg8%>k

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/locked.png
index 8440581c713c9340b065ba491faf0207411074d8..8768a906e462d3e7f5f8d8f707442a47a03f1a2d 100644
GIT binary patch
delta 103
zcmV-t0GR)d0jB|wBwYb>Qb$4nuFf3k00004XF*Lt006O%3;baP0000tNkl<ZSV!&5
zu@L|e6a>-Lff>CiQg3E-@Ch_PBCs#n=nhGeB)yh)k2P|XHSYwKas4An`W;M`dIbV%
JH!DApXeQ|IBxV2r

delta 78
zcmZ3^*vB|Q#l_mw#W5s;^X&ykUIqmo<^x^~|M@;NY@4_<;pErL`PH2Q3Jwhnj7%&X
gU`FFgCiT^MWu^XqKOBF@zBQWFVY!mJ!o)^309Pv<?f?J)

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/open.png
index 0a2f90f91f2d472dcfbc3e2051c1b1568a241334..f0e4e0702a2853145ce1714e8ab4e07439983c72 100644
GIT binary patch
delta 230
zcmV<C02%+&0i^<vB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0002BNkl<ZSVv<R
z1p^Hjp)^ilAKI}GNEra}1+V}K;Na>CCnysqAj$!9x=M;nY#fWALIi<`j1a?_jYn*W
zaR3vP9xy;K1mZh3HQJfWd->Yy2|$Gif>T%T>{`9``kRFneq8lXA)J6H2c$%pWq$np
zc{NmsAdnOjc9=B($QoiCFyK)z_|t%okI#QjIb#McIpZd%5K-Xmky&+HwrnA2{wNp)
gqhJ(_f>AIEM!_f;1p^Ei7y!_xEe!YF6$O#4CgC<%LjV8(

delta 148
zcmZ3=beVC2N_~T;i(^OxXL5oB>taO%DJBHr($Y|yaojG*Q1F=0dX|*RkCT*pKg!PL
zNSa_Zq3V&Zy3^AJYlbJEb*Jb1*M5EfKi5fO3Ez@=9QA@g#Sd;yf4{DYN4>@Im7A=?
vSAh>7KmO!5ni9bi<X^+mze<L;@uGkPZ{tKcE+&S{a_p)HmTs6h@xK}XPvtuy

diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/unlocked.png
index 73fcb9178f139d9cb1b44a459040d27f5c8057ae..93b8c108c62fe84deefe7670165460f4b8471448 100644
GIT binary patch
delta 101
zcmeBUT*^2>C7Q7~$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{Nz%E{-7)?r+a1GBPL#
z95}FdDf2`RZxyQqd1pogj<U2ok4Y*ox8AS~vzBBnI+XEU-t*G?1jd<htW3^+maY>s
F)Bs2XAyNPU

delta 78
zcmZ3=*vB|Q#l_mw#W5s;^X-L&f(!~g%m;Lsepj1pp8A?Aw4=Y%>xjBj0|O%y3x|M$
g1DMgq^m@rR-%@`4GyeoC_FiSJOgqf_Y+}6{01{9f3IG5A


From 8ada15e2b1f08d4e1b4e8ec2734c2bd6a8dc22df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Wed, 7 Aug 2024 19:24:36 +0300
Subject: [PATCH 08/10] Some fixes

---
 Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
index 4cfbaa0ce61a98..c74dcd3e4003fb 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
@@ -54,7 +54,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 80
+        damage: 40
       behaviors:
       - !type:EmptyAllContainersBehaviour
       - !type:PlaySoundBehavior
@@ -65,12 +65,10 @@
           ShardGlassReinforced:
             min: 1
             max: 2
-      # - !type:ChangeConstructionNodeBehavior
-      #   node: brokenGlassBox
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
-    price: 100
+    price: 200
 
 - type: entity
   parent: GlassCase

From 3bf3bef850907e77dfe1e737762f3d202c1581fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Wed, 7 Aug 2024 19:37:30 +0300
Subject: [PATCH 09/10] Some fixes 2

---
 Resources/Locale/ru-RU/ss220/misc/case.ftl                   | 2 +-
 Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml    | 5 ++++-
 .../SS220/Misc/etched_brass_knuckles_case.rsi/meta.json      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl
index 600723c6b87e92..cd7742ba4d7260 100644
--- a/Resources/Locale/ru-RU/ss220/misc/case.ftl
+++ b/Resources/Locale/ru-RU/ss220/misc/case.ftl
@@ -1,4 +1,4 @@
-ent-GlassCase = стеклянный кейс
+ent-GlassCaseEtchedBrassKnuckles = стеклянный кейс
    .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла с основанием из выращенного на тропических планетах дерева и украшенная бархатной подушкой, для предотвращения возможных царапин. 
    .suffix = Гравированный кастет
 
diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
index c74dcd3e4003fb..91a4886fbd60c4 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
@@ -65,13 +65,16 @@
           ShardGlassReinforced:
             min: 1
             max: 2
+          MaterialWoodPlank1:
+            min: 1
+            max: 2
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
     price: 200
 
 - type: entity
-  parent: GlassCase
+  parent: GlassCaseEtchedBrassKnuckles
   id: GlassCaseEtchedBrassKnucklesFilled
   name: glass case
   suffix: Etched brass knuckles, Filled
diff --git a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
index f58b59c9749439..951196bbfb71c2 100644
--- a/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
+++ b/Resources/Textures/SS220/Misc/etched_brass_knuckles_case.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
-    "copyright": "Made by okroshka59 (Discord) for SS220",
+    "copyright": "Made by okroshka59 (Discord) for SS220, modified by Bomjojuk (Discord)",
     "size": {
         "x": 32,
         "y": 32

From 0c406b2f382f17d28fd4cfe47a51fa9c9deb3e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=20=D0=A5=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B2=D1=87=D0=B8=D1=86?= <kirus0059@gmail.com>
Date: Wed, 7 Aug 2024 20:28:49 +0300
Subject: [PATCH 10/10] Fix description

---
 Resources/Locale/ru-RU/ss220/misc/case.ftl              | 2 +-
 Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl
index cd7742ba4d7260..cd813ef31fd68a 100644
--- a/Resources/Locale/ru-RU/ss220/misc/case.ftl
+++ b/Resources/Locale/ru-RU/ss220/misc/case.ftl
@@ -1,5 +1,5 @@
 ent-GlassCaseEtchedBrassKnuckles = стеклянный кейс
-   .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла с основанием из выращенного на тропических планетах дерева и украшенная бархатной подушкой, для предотвращения возможных царапин. 
+   .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла, а основание из дерева, выращенного на тропических планетах. Коробка украшена бархатной подушкой, чтобы предотвратить возможные царапины.
    .suffix = Гравированный кастет
 
 ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс
diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
index 58b3c5d9c77a2c..5faf431076acc9 100644
--- a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
+++ b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
@@ -1,2 +1,2 @@
 ent-EtchedBrassKnuckles = гравированный кастет
-   .desc = Гравированный кастет Квартирмейстера, сделанный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями воровства личных вещей и материалов из отдела снабжения.
+   .desc = Гравированный кастет квартирмейстера, изготовленный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями краж личных вещей и материалов из отдела снабжения.