From: PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:13:47 +0000 (-0800)
Subject: Added "The Throngler" (#22995)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e584970c261aedbe07e834659d75043598ee2ccd;p=space-station-14.git

Added "The Throngler" (#22995)

* The Throngler.

* The Thronger

* Thron

* Revert "Thron"

This reverts commit e6774ea4eefd4eee52bd6e3340f77d5890b50083.

* Fixes Inhand sprites
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 35fc33ec66..05cac3ae7b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -159,3 +159,35 @@
     size: Normal
     sprite: Objects/Weapons/Melee/cutlass.rsi
   - type: DisarmMalus
+
+- type: entity
+  name: The Throngler
+  parent: BaseItem
+  id: Throngler
+  description: Why would you make this?
+  components:
+    - type: Sharp
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/Throngler2.rsi
+      state: icon
+    - type: MeleeWeapon
+      wideAnimationRotation: -135
+      attackRate: 10
+      damage:
+        types:
+          Structure: 150
+          Slash: 20 #Horror
+          Blunt: 20
+          Heat: 20
+          Piercing: 20
+          Radiation: 10
+      soundHit:
+        path: /Audio/Effects/explosion_small1.ogg
+    - type: Reflect
+      enabled: true
+      reflectProb: .25
+      spread: 90
+    - type: Item
+      size: Ginormous
+      sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi
+    - type: DisarmMalus
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/icon.png
new file mode 100644
index 0000000000..2a88710ad5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/inhand-left.png
new file mode 100644
index 0000000000..6211fb160d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/inhand-right.png
new file mode 100644
index 0000000000..4c57d47a1a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/meta.json
new file mode 100644
index 0000000000..e4fc733a81
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/Throngler-in-hand.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by PoorMansDreams",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/icon.png
new file mode 100644
index 0000000000..cfce2fe02c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/inhand-left.png
new file mode 100644
index 0000000000..f21ccd8c4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/inhand-right.png
new file mode 100644
index 0000000000..f21ccd8c4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/meta.json
new file mode 100644
index 0000000000..d8e87d7650
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/Throngler2.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by PoorMansDreams",
+  "size": {
+    "x": 47,
+    "y": 47
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}