Cherry-picked commit 393bcbf from space-wizards/space-station-14/master

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -198,6 +198,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.
 

Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml

@@ -33,19 +33,19 @@
       - id: SyringeStimulants
 
 - type: entity
-  id: Observationskit
   parent: BoxCardboard
-  name: observations kit
-  suffix: Filled
+  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: StorageFill
-      contents:
-        - id: SyndiCrewMonitorEmpty
-          amount: 1
-        - id: PowerCellHigh
-          amount: 1
-        - id: ClothingEyesGlassesHiddenSecurity
-          amount: 1
-        - id: SurveillanceCameraMonitorCircuitboard
-          amount: 1
-
+  - type: Storage
+    grid:
+    - 0,0,3,1
+  - type: StorageFill
+    contents:
+      - id: ThrowingKnife
+        amount: 4
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: throwing_knives

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -65,6 +65,17 @@
   categories:
   - UplinkWeapons
 
+- 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

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

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
         },

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"
     },

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
+        }
+    ]
+}