From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:23:11 +0000 (+0100)
Subject: More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite... 
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5fd3d4552c8cf783fe8fe03dc0cfa472958e6282;p=space-station-14.git

More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance)  (#23408)

* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 300935d901..312dfa35f3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -178,3 +178,41 @@
       types:
         Radiation: 5
         Piercing: 5
+
+- type: entity
+  id: PelletGrapeshot #tally fucking ho
+  name: grapeshot pellet
+  noSpawn: true
+  parent: BaseBullet
+  components:
+  - type: Sprite
+    noRot: false
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: grapeshot
+      shader: unshaded
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 15 
+        Structural: 5 
+
+- type: entity
+  id: PelletGlass
+  name: glass shard
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    noRot: false
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: shard
+      shader: unshaded
+  - type: EmbeddableProjectile
+    deleteOnRemove: true
+  - type: Projectile
+    deleteOnCollide: false
+    damage:
+      types:
+        Slash: 25
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
index 86da8e6662..d3d35f7180 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@@ -135,3 +135,33 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
     state: ball
+
+- type: entity
+  id: Grapeshot
+  name: grapeshot
+  suffix: Pirate
+  parent: BaseGrenade
+  components:
+  - type: CartridgeAmmo
+    proto: PelletGrapeshot
+    count: 15
+    spread: 40
+    deleteOnSpawn: true
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    state: grapeshot
+
+- type: entity
+  id: Glassshot
+  name: glassshot
+  suffix: Pirate
+  parent: BaseGrenade
+  components:
+  - type: CartridgeAmmo
+    proto: PelletGlass
+    count: 5
+    spread: 10
+    deleteOnSpawn: true
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    state: glassshot
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index be1ca7b272..6b7b02e70f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -69,29 +69,48 @@
   id: Musket
   description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo.
   components:
+  - type: Sharp
   - type: Item
     size: Large
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/musket.rsi
+    state: base
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/musket.rsi
   - type: Gun
+    useKey: false
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+  - type: UseDelayOnShoot
+  - type: UseDelay
+    delay: 8 #it's a musket
   - type: BallisticAmmoProvider
     whitelist:
       tags:
       - CartridgeAntiMateriel
     capacity: 1
     proto: CartridgeAntiMateriel
-
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Piercing: 15 #you fucking stab em
+        Bloodloss: 2 #no way to apply bleed, triangular bayonet wounds are hard to fix(source:that one copypasta)
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    
 - type: entity
   name: flintlock pistol
   parent: BaseWeaponSniper
   id: WeaponPistolFlintlock
   description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo.
   components:
+  - type: Gun
+    minAngle: 0
+    maxAngle: 30 #miss him entirely because the barrel is smoothbore
   - type: Item
     size: Small
     storedRotation: 90
@@ -99,6 +118,9 @@
     sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Snipers/flintlock.rsi
+  - type: UseDelayOnShoot
+  - type: UseDelay
+    delay: 8 #it's a flintlock
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -107,3 +129,4 @@
     proto: CartridgeAntiMateriel
   - type: StaticPrice
     price: 0
+
diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml
index e74ccb5fef..39aea03cac 100644
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -176,4 +176,4 @@
   flavor: bitter
   color: "#9e6b38"
   boilingPoint: 190.0 # Perfluorooctanoic Acid.
-  meltingPoint: 45.0
+  meltingPoint: 45.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
index 6b1aff4be6..318490931f 100644
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -72,4 +72,4 @@
   products:
     Ethanol: 5
     Hydrogen: 3
-    Sulfur: 2
+    Sulfur: 2
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png
new file mode 100644
index 0000000000..33bfe248b2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png
new file mode 100644
index 0000000000..c67ba454bb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
index bfdf73fe57..3faf26ebe5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, ball Made by Alekshhh (Github) for ss14",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, ball, glassshot and grapeshot Made by Alekshhh (Github) for ss14",
     "states": [
         {
             "name": "baton"
@@ -25,6 +25,12 @@
         {
             "name": "ball"
         },
+        {
+            "name": "grapeshot"
+        },
+        {
+            "name": "glassshot"
+        },
         {
             "name": "spent"
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/grapeshot.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/grapeshot.png
new file mode 100644
index 0000000000..1104d5eaf2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/grapeshot.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
index f2543b0b6b..505d97a075 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
@@ -72,6 +72,12 @@
           0.05
         ]
       ]
+    },
+    { 
+      "name": "grapeshot"
+    },
+    { 
+      "name": "shard"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png
new file mode 100644
index 0000000000..badb333185
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png
index 39ce4fe713..77b10f839d 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png
deleted file mode 100644
index d2b5dfe7ae..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png
deleted file mode 100644
index 46f122e61a..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png
deleted file mode 100644
index 0ea1fe4ed6..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png
index d78916e60e..b14ce478fb 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png
index c81fea4809..44ab737524 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
index 494e6cc88a..43f600b580 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
@@ -1,24 +1,15 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1a574ded496e5ebb5373a8221c2c563820fc137/icons/obj/guns/projectile/obrez_bolt.dmi",
+  "copyright": "Made by Pato Grone for ss14",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "icon"
-    },
     {
       "name": "base"
     },
-    {
-      "name": "bolt-open"
-    },
-    {
-      "name": "bolt-closed"
-    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png
index bf84659ce6..94d8949dc7 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png
deleted file mode 100644
index ab9c5cdc91..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png
deleted file mode 100644
index bcdc368171..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png
deleted file mode 100644
index 3b7198a32d..0000000000
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png
index 6c784dde9c..1353d23daa 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png
index 5a52cdc010..144d789dd3 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
index 608323e460..7609e516b3 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi",
+  "copyright": "Made by Pato Grone for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,15 +17,6 @@
     },
     {
       "name": "base"
-    },
-    {
-      "name": "bolt-closed"
-    },
-    {
-      "name": "bolt-open"
-    },
-    {
-      "name": "icon"
     }
   ]
 }
\ No newline at end of file