Skip to content

Commit

Permalink
Mirror: Throwing Knives: Syndicate Kit (#310)
Browse files Browse the repository at this point in the history
## Mirror of PR #26026: [Throwing Knives: Syndicate
Kit](space-wizards/space-station-14#26026) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `393bcbfc1346589075ad960473685c78bdbf46e5`

PR opened by <img
src="https://avatars.githubusercontent.com/u/134914314?v=4"
width="16"/><a href="https://github.com/UbaserB"> UbaserB</a> at
2024-03-12 06:57:41 UTC

---

PR changed 13 files with 101 additions and 8 deletions.

The PR had the following labels:
- No C#
- Changes: Sprites


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> 
> This PR adds throwing knives and a syndicate bundle in the bundle
category for 6 TC which comes with 4 throwing knives in a box. Each
knife does 10 slash + 15 pierce damage on throw, and 5 flash per hit (10
DPS). This makes it better than a kitchen knife, but worse than a combat
knife, which is what security is fitted with.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> 
> This kit is built for weakening an enemy from a distance (from
chasing, etc) while being able to fight back if cornered into a 1v1 CQC
fight. Sure, you can kill several people with the kit; hence why it's so
expensive, but there are drawbacks. Firstly, once it embeds into a
target they are able to pull it out. Secondly, when you are pulling them
out of a target, YOU are vulnerable. Thirdly, if you miss your hits the
target will probably not die. Good things you have four knives and can
stab them to death.. better than punches!
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> **It embeds and kills in 4 throws on an unarmoured target.**
>
![image](https://github.com/space-wizards/space-station-14/assets/134914314/05f4112d-a08c-4bde-9b34-8a5ecde0b270)
> 
> **Item description.**
>
![image](https://github.com/space-wizards/space-station-14/assets/134914314/87704a6e-8501-4f19-a158-bf89d6b4a83e)
> 
> **4 knives.**
>
![image](https://github.com/space-wizards/space-station-14/assets/134914314/44dc4c40-add3-46be-b224-b71e2f14f1e9)
> 
> **Kit on uplink.**
> [IMG NEEDS UPDATING]
> 
> **Changelog**
> 
> 🆑 Ubaser
> - add: You can now purchase a set of 4 throwing knives in the uplink
as a bundle for 12 TC.


</details>

---------

Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
SimpleStation14 and VMSolidus authored Jun 29, 2024
1 parent 45b5c92 commit 0269efc
Show file tree
Hide file tree
Showing 13 changed files with 110 additions and 18 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
37 changes: 27 additions & 10 deletions Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,31 @@
name: observations kit
suffix: Filled
components:
- type: StorageFill
contents:
- id: SyndiCrewMonitorEmpty
amount: 1
- id: PowerCellHigh
amount: 1
- id: ClothingEyesGlassesHiddenSecurity
amount: 1
- id: SurveillanceCameraMonitorCircuitboard
amount: 1
- type: StorageFill
contents:
- id: SyndiCrewMonitorEmpty
amount: 1
- id: PowerCellHigh
amount: 1
- id: ClothingEyesGlassesHiddenSecurity
amount: 1
- id: SurveillanceCameraMonitorCircuitboard
amount: 1

- 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
11 changes: 11 additions & 0 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- UplinkWeapons

- type: listing
id: UplinkGlovesNorthStar
name: uplink-gloves-north-star-name
Expand Down
29 changes: 29 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 10 additions & 7 deletions Resources/Textures/Objects/Storage/boxes.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -35,7 +35,7 @@
"name": "sechud"
},
{
"name": "bottle"
"name": "bottle"
},
{
"name": "box"
Expand Down Expand Up @@ -142,6 +142,9 @@
{
"name": "syringe"
},
{
"name": "throwing_knives"
},
{
"name": "trashbag"
},
Expand All @@ -152,12 +155,12 @@
"name": "writing_of_doom"
},
{
"name": "headset"
},
"name": "headset"
},
{
"name": "encryptokey"
},
{
"name": "encryptokey"
},
{
"name": "inhand-left",
"directions": 4
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -76,6 +76,9 @@
{
"name": "syringe"
},
{
"name": "throwing_knives"
},
{
"name": "ziptie"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit 0269efc

Please sign in to comment.