Throwing Knives: Syndicate Kit (#26026)

* add

* rename

* change damage type and lower price

* 6 tc

* fix?

* missed listing

* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json

* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json

* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 5a54d76e9334fa9a5a74e793caec9f12ecaab3a4..8c95798603a31a108ad3f0894e6a41fd6606cf2e 100644 (file)
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -201,6 +201,9 @@ uplink-decoy-kit-desc = State-of-the-art distraction technology straight from RN
 uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs!
 
+uplink-knives-kit-name = Throwing Knives Kit
+uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+
 uplink-meds-bundle-name = Medical Bundle
 uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
 

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 0f1bd0f46520afdee698415f4b068e9d34c86fed..d2e889c937d5d110fefe189714967524e67f741a 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -31,3 +31,21 @@
         amount: 2
       - id: BaseChemistryEmptyVial
       - id: SyringeStimulants
+
+- type: entity
+  parent: BoxCardboard
+  id: ThrowingKnivesKit
+  name: throwing knives kit
+  description: A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,3,1
+  - type: StorageFill
+    contents:
+      - id: ThrowingKnife
+        amount: 4
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: throwing_knives

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 5ff0f58fb16cf2d82a3e90c2e5ec9d2bc5cd9df5..e873cdec70b067a6905d3118f4ae3003d529b284 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -65,6 +65,17 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkThrowingKnivesKit
+  name: uplink-knives-kit-name
+  description: uplink-knives-kit-desc
+  icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: throwing_knives }
+  productEntity: ThrowingKnivesKit
+  cost:
+    Telecrystal: 6
+  categories:
+    - UplinkWeaponry
+
 - type: listing
   id: UplinkGlovesNorthStar
   name: uplink-gloves-north-star-name

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index b5d597715aa9d039be058cd24c2dee32e64910c4..03654061cedc26d3267e9865ebc46352554554a6 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -252,3 +252,32 @@
     sprite: Objects/Weapons/Melee/uranium_shiv.rsi
   - type: Sprite
     sprite: Objects/Weapons/Melee/uranium_shiv.rsi
+
+- type: entity
+  name: throwing knife
+  parent: BaseKnife
+  id: ThrowingKnife
+  description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
+  components:
+  - type: Tag
+    tags:
+    - CombatKnife
+    - Knife
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/throwing_knife.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 2
+    damage:
+      types:
+        Slash: 5
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 10
+        Piercing: 15
+  - type: Item
+    sprite: Objects/Weapons/Melee/throwing_knife.rsi

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 23868a906f4c96ad78a1a7a450c9931441d50971..53ac39b639b234801dc6a29c33ee0972442827d7 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef.",
   "size": {
     "x": 32,
     "y": 32
@@ -35,7 +35,7 @@
             "name": "sechud"
         },
         {
-                       "name": "bottle"
+        "name": "bottle"
         },
         {
             "name": "box"
@@ -142,6 +142,9 @@
         {
             "name": "syringe"
         },
+        {
+            "name": "throwing_knives"
+        },
         {
             "name": "trashbag"
         },
@@ -152,12 +155,12 @@
             "name": "writing_of_doom"
         },
         {
-                       "name": "headset"
-               },
+        "name": "headset"
+        },
         {
-                       "name": "encryptokey"
-               },
-               {
+            "name": "encryptokey"
+    },
+    {
             "name": "inhand-left",
             "directions": 4
         },

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png
new file mode 100644 (file)
index 0000000..834410a
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png differ

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
index 858fc7c4e54c120a2f87bba72b5422a081e1abc5..935b0b9f8b3ec72e16da22796700d609351133f4 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, vials drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
+  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
   "size": {
     "x": 32,
     "y": 32
@@ -76,6 +76,9 @@
     {
       "name": "syringe"
     },
+    {
+      "name": "throwing_knives"
+    },
     {
       "name": "ziptie"
     },

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png
new file mode 100644 (file)
index 0000000..b2af7bc
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..ea2a6bb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png
new file mode 100644 (file)
index 0000000..2c61755
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..5988d57
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..09c015e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json
new file mode 100644 (file)
index 0000000..373d2d7
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}