From aeb261c9089b00dfc15dba84818383ac6b3e04aa Mon Sep 17 00:00:00 2001
From: SimpleStation14 <Unknown>
Date: Mon, 22 Apr 2024 05:51:08 -0400
Subject: [PATCH 1/3] Cherry-picked commit
 393bcbfc1346589075ad960473685c78bdbf46e5 from
 space-wizards/space-station-14/master

---
 .../Locale/en-US/store/uplink-catalog.ftl     |   3 ++
 .../Catalog/Fills/Boxes/syndicate.yml         |  28 ++++++++---------
 .../Prototypes/Catalog/uplink_catalog.yml     |  11 +++++++
 .../Entities/Objects/Weapons/Melee/knife.yml  |  29 ++++++++++++++++++
 .../Objects/Storage/boxes.rsi/meta.json       |  17 +++++-----
 .../Storage/boxes.rsi/throwing_knives.png     | Bin 0 -> 1141 bytes
 .../Objects/Storage/boxicons.rsi/meta.json    |   5 ++-
 .../Storage/boxicons.rsi/throwing_knives.png  | Bin 0 -> 1392 bytes
 .../throwing_knife.rsi/equipped-BELT.png      | Bin 0 -> 1289 bytes
 .../Weapons/Melee/throwing_knife.rsi/icon.png | Bin 0 -> 1593 bytes
 .../Melee/throwing_knife.rsi/inhand-left.png  | Bin 0 -> 1296 bytes
 .../Melee/throwing_knife.rsi/inhand-right.png | Bin 0 -> 1298 bytes
 .../Melee/throwing_knife.rsi/meta.json        |  26 ++++++++++++++++
 13 files changed, 97 insertions(+), 22 deletions(-)
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png
 create mode 100644 Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/equipped-BELT.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/throwing_knife.rsi/meta.json

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 500bb801c4a..da99d496748 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/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.
 
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 53c526f0339..d2e889c937d 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/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
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index f18deb5c0dc..7df89e701c4 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/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
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index b5d597715aa..03654061ced 100644
--- 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 23868a906f4..53ac39b639b 100644
--- 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
index 0000000000000000000000000000000000000000..834410a43ef64bd0f3dbfd9d852247d464cbd5f0
GIT binary patch
literal 1141
zcmZ`&O=#0#7*2JTtvC;YZit60f{2)WZB~X2X<#$^3EEL=g=`16Hc7XzG+#)*+BgSJ
z4^u%<QBZgB?<nlxMG+5r*-=q8QSdM?!iM5O5mXev{Mfal`^fkA=6&9u=l$MG+2O(V
z*q#_c5be^Cn8Q2i&DJPho$2ZCc#Al>!9HT)<=$0%*`di&DU%@%;&UsW-gtBTI$qnX
zp%I554$ONq(!q5-B8aU>&&x>89OD#NW(q1SYK&X9d=&3;_*m9Zfpp7;>2PkE@-;Yo
z_QZf9eHAp7rsPbPJOXWv>|x?eoDyOrN%FQ@;&S3Z2*<ZHHHnbL0Z^@0nQAu!?Fo=b
zrBWcy0+yw*2JM_SQNg86XJ26Cza3F?6kE5D4o%XtTPVT`N>h~Qs5XK)Ri);~s@R6_
zMOA=iXl2br4oENw&<uz4(t3oZ6Vic+0p1@Bi#LTy7E+R!seTv76Xu5lReZk=QbC;p
zVB_(_beyHx6sYBg!{=3nLpm}vpSW5+K7+jmYLt5V9tDQ(G0PbRb0ST-w5pW~6$4R1
z5xQfrG^RpW=0Tv?XdsX_+T}r$5O^<fZX~BU(5QIS3v5r4_vvVmt`{Ld$W0OT(v67h
zBt#HDDqB}16KS?(;|CUa4E=4cvC-DL^Ao0y1U59VL0pHbD-hRfqbjtg@_sQInA}t=
zv=p#f_fCT*@GF43K#1|6)=@(2?u&`1xXorIu{STbeYskQ&63*(=nsi!;%kXJwX`kw
zdH=3+l(}^AZ_Ayt=oM6W#TqA~;kR-nI`i(w^w;IV#kI@%$2(_=Z%21`QH#ly<t>8P
z^E>(cRx~-Ey}kOY>*2{yt7|vq_uqb=K@7Mycl6Mok8_dE*+}P;Zi~1#+Hs@h!h`!>
N%S-*k;zHl}`F|_-V#WXf

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
index 858fc7c4e54..935b0b9f8b3 100644
--- 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
index 0000000000000000000000000000000000000000..b2af7bce88436ed9b060cec8bd6f97019537caa9
GIT binary patch
literal 1392
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|=rE42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Tl`4#c`Y4Iuf`MEaw5QV4)Ktxf^wb94o1RIdY
zts;X`i}Q0zK|yb4WM*Om4h|GiL?l3TL}1l{EQ+opAS1sdADF0$GLt>?N>Ymoihv0W
zVk6W(+$zw`LRcP}msw(G1T_Fn7)cjW1X(#2m6YcfWru(x10^JJs)CvX300(Y3dscE
z7y#x1J1!f2c#g8;T5vFZ7clEqd%8G=L~y<hGt6pn5c$j5wX|tzXqMxKb8TmNZ5%vS
zy>$v&<~>y})k!b$Ij_*Boec?7c@H{qFghl3r*<FFKVxt(@sG9+OPO8A<KO2i^Y6dd
z!LX}@>G!+?2O}8vz5m}+81h%=^c1PKS83O{n;1@QN}0Z7^Xpv`mc7*YUNB{2a+8@u
z6<dL5fp2-B3Ui`_-=$?XEvLd+LjNDleo+}W-yu+>VE;{x%R3Bx1%7%JU02a%^lN%F
zE%jh-`3kPxCsNfyV%|*TT~Hz7n*90eUlmUe8<mN?3OBdq7Ra!tsW0D9Q|s1o{bLSa
z{%P?QtGbe>99+_S!k}&6*}S*Quc$Du?mypn?RQoOuZK{=k6;xQ!K#XyN7Ju|PyZWn
zMDN`Biup!2tQbXXfBj=p>r*o7QR<T^V#>Yk6np)zppMvt=Rf6n1)cS_o?!bBEpWVW
zzxWC@_m8>zq*a)GFBhEM{dHD<D)SxAjYq0eY}zLBbo_6d!7$sQOzh{TeaA|etQZX&
Z<G=pS5I<9sb{|yQdAj<!taD0e0ssUm+$#V8

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..ea2a6bbc0727af8a2075a66b237ea3a15651d10b
GIT binary patch
literal 1289
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf
zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we
z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p
zz)=9q2X<UG`tUqu$7OGls0qxxLY^*;Ar*{oZy9nOG7xEaxT5=p-r7FhCIt)4dkexR
z_{kj?_7FT09kQpfT%aVRU`pQIDIVW+GObO{-Zwn!{dwPXKYgbU3JnZQ9H>MaQ|Ei{
z!xO@M-(SD!`>3)=h^2Je2J^D5F{d?VMa9-GwO<j`^!&AMyK;O@eUQz&?Xgo$*YpOS
ze7|||oh8w)SLesDET0@6buR4Qj}-!#rXyLlLutaXji$ASqrNkju!ib>_78j!x3y?Z
zAj4G~+4hAyrlqc*dNa%HszigAoqha~oP8H+mOXafayE9a!9u>WGK-y+(MulJo4!<p
dSkl1ERKMwv#~%@)xKdCt<mu|?vd$@?2>{Sco1*{#

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..2c61755b52c35b9138c5aa7f93ec6e71bffa7871
GIT binary patch
literal 1593
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=7^vU~2s2LA=96Y%V9v=5i71Ki^|4CM&(%vz$xlkvtH><?
z>$0h^0y1+`OA-|-a&z*EttxDlz$&bOY>=?Nk^)#sNw%$0gl~X?bAC~(f|;Iyo`I4b
zmx6+VO;JjkRgjAtR6CGotCUevQedU8UtV6WS8lAAUzDzIXlZGwZ(yWvWTXpJp<7&;
zSCUwvn^&w1F$89gOKNd)QD#9&W`3Rm$lS!F{L&IzB_)tWZ~$><N;2G@g3_WKuq`Rc
z`l&goxv6<2#rlSNhWgm_m1L$NT$oo34Gv(y=!0Z{+6=I2^DHPyHUWl|YX#6fQ2zlP
znhdtLxFkg%NrAqRfq{jtfsw9}r9Rw$K<C?}BwLkamgJ;@0}k#Va0oi)l%R@&)PsT`
zCleI1Rym1z>9$H0x+$q?iKRIuN_L*U?(xRP#^yHq5LKwUA)=^;+UR4k-v;DstH_|#
z;{2RaP`KM!n%RJZ0!0uJ0T2xl*fbyuqH74q$S=tUrl+FJWY4^k)S`kSVA=xPX9Tql
zw+eK#5O#;=WtP~%3_ue`(uEW^R*pp_<@rU~A>epG1R_o)P-7qgij+Pfi60#Jz|?QY
zWup(zNp@V%mxb~$FfjRex;TbJaJ~)o_78Rx`Ind7Qc!9C=1{nZp6(V`<|%VS?rwO|
zv`YFX^9e4~PsSA-Axxj#MNAkEdHI&OX76G=)GMZ}=rs8q-}j!mL07V^3U2f6J^AI#
zoq03g8>T;Fdis2i^@6E~7#7=l^gJ%xJ+Y%+lXKaHqX+i&-QKcutMlpi*H_-Xt=jRV
zd*1~6f=%ZSTsAiTP#JCb>kaF>`@6Xp?f)>h#U}3b>)o#T)52Oly*PYaWOlU5PTu2@
z`>WU4$ImIf^YZ<&n>TcNwn<m~s^NK9U~e>&$7C%_^!e&PWtFDOYqF~P)RrY}dv#vx
z+mV|31?|)Bt-W|{n`iU1w>;<0W?wzjc_fLaDOPdysp~DDCN*y^+BSEpyF4%F)yewt
zqVAQxxweIq_1K#BTHaROvFh!q<p&IS3^?tcKNfzRvA0r|nOU&q_j``G&!5+S41KsQ
zSgGJccD%RR<OHE*J3C#J`aDtu{N37Ee;hirNN7h%kY(JyqTWRp*^{h)EPA-O>{eFz
zK3OI`antZn#mM^|`vUTx9X{?q)pV<`M@~&xT=!J%TJAry)DFy+mU5`JKlnhdpM7PB
z*G*T;g$Ycu3|n7Vm0iv>{N65lwq#bQ@Z<*>?{c(v2M9F!Wq<U(dNtwcpEq)HNz4KX
zkr(b<6yfBu|DSs1XxPWU((A%vShVvtdKgsLaIb4fp8d<8UBV(;oA2BA1=p{3u8%yG
zSP&g{*H$q}XwHGZX0hUD%bG6Ndlc-<vs3(eZe>Qbu$Pe0yk&>D6*Hq-gd*mBP7>5;
hNwHl1#vxGFf@x_avz=0K&TUY!?dj_0vd$@?2>>-FL7@Nu

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..5988d571dc12ca1c485efc87735bbba3ce635640
GIT binary patch
literal 1296
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf
zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we
z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p
zz)=9q2X<UG`tUqu$7OGls0qxxlAbP(Ar*{oZ~5~%8VVf$xU0QISU_BGU81s|lG!@P
zIUPrAwWj)f67!8(X79Ss%zwtY`RAkkoF6nZFmWg}AQM`Re;-O@7hOMg^~tJE$*U}t
zNjVF?W=SraT)6Sx*RuZQpPxn+ZNDq>*mm#I&6k+g^W`6|5prbv@a}`Hz?!tn&ug}I
zy!5S_wCuBHzq<SN&G(+|eZHG#eOA=e?c74Hf({IfECSex#{HrjTvwJK2&-(XJ+bZZ
z$_~?*YV(8}5$|><<?1nK*zRfE;x>U{MO(OH#J#lhTTXtx$E#ub`D;1*mDf3?|1NQ#
p_;-Kx%DB?a9Dh3C-ua-+#BaJLkNt{4Ehnfn@^tlcS?83{1OP7tpo#zh

literal 0
HcmV?d00001

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
index 0000000000000000000000000000000000000000..09c015efac56e7935ff49a7488bea47ee21f706a
GIT binary patch
literal 1298
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy
zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&<gn3A8As#lR)
z0M=zwVFhI7rj{fsROII56<bx<DuGp40ofp7eI*63l9Fs&r3l{u1?T*tR0T6V13d#J
zJ1zwU1)HLjG^-#NH>h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6
zGOr}DLN~8i8Da>`9GBGM<f6=ilFa-(1(3OkN%^HEwn|DMi{Jp_&Xi=hJq4vjIbd5-
zlJ!$_Qgc)DN{aOj^$hi~=_|=hL%1-n7#bYFfYArZ0JRxl)#h1Hl57GDDc1_1d!YUU
zIy4z<Z*fVAK9T}`BLf2qT>~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G
zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf
zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we
z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p
zz)=9q2X<UG`tUqu$7OGls0qxx(w;7kAr*{oZ=U5m<RH-Y@J9OrQ4KStTW#VSg+3-p
zcZq7=a8GI3`6kck(LWXGdofOBkKferA3SZsE6&8B(7=F9%+bGI*2NXOGcE7N^VfIp
zz3YGf>1D--Z+E{R|F`Dg_uaXhW6tcgx!1%pi>paAZW9~hvW5@d6(?_2pParSE_c-*
z{|Wn+{=e67Ep6>X)9_3GCW~F>Grp7k(%8AgO9|B?RC`-lOEe^_b5>b}$<Mu<_`3bw
zKC?Tf?dA8k&-3nmF_~cr-+BvGfkli(t@@n{(*KrD&&>HEbI&63Re#m1*}He%`O5qM
s!?yrm-qO5?#!wak2L?tE(OAW5$7GzxZoH}C0;oLlboFyt=akR{01HQ^j{pDw

literal 0
HcmV?d00001

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
index 00000000000..373d2d77701
--- /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
+        }
+    ]
+}

From 51a68a13eb9b17e49a124ad8e276aecf8a0a0c4c Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 28 May 2024 21:14:05 -0400
Subject: [PATCH 2/3] Update syndicate.yml

---
 .../Catalog/Fills/Boxes/syndicate.yml           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index d2e889c937d..7b5b05a49a5 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -32,6 +32,23 @@
       - id: BaseChemistryEmptyVial
       - id: SyringeStimulants
 
+- type: entity
+  id: Observationskit
+  parent: BoxCardboard
+  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: entity
   parent: BoxCardboard
   id: ThrowingKnivesKit

From ac677bad76bc140c8c7e84cb5a85bc36bfb2c92b Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Tue, 28 May 2024 22:11:08 -0400
Subject: [PATCH 3/3] Update uplink_catalog.yml

---
 Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index e690677c960..328ace7ba15 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -74,7 +74,7 @@
   cost:
     Telecrystal: 6
   categories:
-    - UplinkWeaponry
+    - UplinkWeapons
 
 - type: listing
   id: UplinkGlovesNorthStar