SerbiaStrong-220 · Ady4ik · Aug 12, 2024 · Jul 21, 2024 · Jul 21, 2024 · Jul 21, 2024
diff --git 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
@@ -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
diff --git a/Resources/Locale/ru-RU/ss220/misc/case.ftl b/Resources/Locale/ru-RU/ss220/misc/case.ftl
@@ -0,0 +1,7 @@
+ent-GlassCaseEtchedBrassKnuckles = стеклянный кейс
+   .desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла, а основание из дерева, выращенного на тропических планетах. Коробка украшена бархатной подушкой, чтобы предотвратить возможные царапины.
+   .suffix = Гравированный кастет
+
+ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс
+   .desc = { ent-GlassCase.desc }
+   .suffix = Гравированный кастет, Заполненый
diff --git a/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl b/Resources/Locale/ru-RU/ss220/weapons/brass_knuckles.ftl
@@ -0,0 +1,2 @@
+ent-EtchedBrassKnuckles = гравированный кастет
+   .desc = Гравированный кастет квартирмейстера, изготовленный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями краж личных вещей и материалов из отдела снабжения.
diff --git 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/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -18,6 +18,7 @@
     MagbootsStealObjective: 1
     CorgiMeatStealObjective: 1
     ClipboardStealObjective: 1
+    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
@@ -0,0 +1,87 @@
+# © 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: 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.
+  components:
+  - type: Item
+    size: Large
+  - type: Lock
+  - type: LockVisuals
+  - type: Sprite
+    sprite: SS220/Misc/etched_brass_knuckles_case.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: brassknukles
+      map: ["enum.ItemCabinetVisuals.Layer"]
+      visible: true
+    - state: closed
+      map: ["enum.OpenableVisuals.Layer"]
+    - 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:
+        enum.ItemCabinetVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: { state: open }
+          False: { state: closed }
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+      - !type:EmptyAllContainersBehaviour
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassReinforced:
+            min: 1
+            max: 2
+          MaterialWoodPlank1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 200
+
+- type: entity
+  parent: GlassCaseEtchedBrassKnuckles
+  id: GlassCaseEtchedBrassKnucklesFilled
+  name: glass case
+  suffix: Etched brass knuckles, Filled
+  components:
+  - type: AccessReader
+    access: [["Quartermaster"]]
+  - 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
@@ -0,0 +1,43 @@
+# © 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: EtchedBrassKnuckles
+  description: кастет
+  components:
+  - type: Sprite
+    sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
+    state: icon
+  - type: Clothing
+    sprite: SS220/Objects/Weapons/Melee/etched_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: Tag
+    tags:
+    - EtchedBrassKnuckles
+  - type: StaticPrice
+    price: 1000
+  - type: StealTarget
+    stealGroup: EtchedBrassKnuckles
diff --git 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
+    state: icon
+
+- type: stealTargetGroup
+  id: EtchedBrassKnuckles
+  name: engraved brass knuckles
+  sprite:
+    sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
+    state: icon
diff --git a/Resources/Prototypes/SS220/Objectives/traitor.yml 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: EtchedBrassKnucklesStealObjective
+  components:
+  - type: NotJobRequirement
+    job: Quartermaster
+  - type: StealCondition
+    stealGroup: EtchedBrassKnuckles
+    owner: job-name-qm
diff --git a/Resources/Prototypes/SS220/tags.yml b/Resources/Prototypes/SS220/tags.yml
@@ -84,4 +84,8 @@
   id: PowerCellHigh
 
 - type: Tag
-  id: WeaponFlareGun
+  id: WeaponFlareGun
+
+# New Qm highrisk
+- type: Tag
+  id: EtchedBrassKnuckles
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
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
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
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
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
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
@@ -0,0 +1,32 @@
+{
+    "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, modified by Bomjojuk (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "closed"
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        },
+        {
+            "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
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
diff --git a/...extures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png b/...extures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/equipped-HAND.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/icon.png
diff --git a/.../Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png b/.../Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-left.png
diff --git a/...Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png b/...Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/inhand-right.png
diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/etched_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) for SS220",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-EtchedBrassKnuckles = гравированный кастет
		.desc = Гравированный кастет квартирмейстера, изготовленный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями краж личных вещей и материалов из отдела снабжения.