From caa4da31f3ace7a18691d437af9d7408fca86af1 Mon Sep 17 00:00:00 2001
From: KEEYNy <128301315+KEEYNy@users.noreply.github.com>
Date: Fri, 19 May 2023 13:21:36 +0300
Subject: [PATCH] Death squad changes (#16173)

---
 .../Entities/Clothing/Uniforms/jumpsuits.yml  |  18 ++++++++++++
 .../Roles/Jobs/Fun/misc_startinggear.yml      |   6 ++--
 .../deathsquad.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 488 bytes
 .../Uniforms/Jumpsuit/deathsquad.rsi/icon.png | Bin 0 -> 342 bytes
 .../Jumpsuit/deathsquad.rsi/inhand-left.png   | Bin 0 -> 336 bytes
 .../Jumpsuit/deathsquad.rsi/inhand-right.png  | Bin 0 -> 335 bytes
 .../Jumpsuit/deathsquad.rsi/meta.json         |  26 ++++++++++++++++++
 7 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index ea64886a25..8f16a90a39 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1,3 +1,21 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitDeathSquad
+  name: Death squad uniform
+  description: Advanced armored jumpsuit used by special forces in special operations.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+        Heat: 0.8
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitAncient
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index dbd4570b2b..a966bf017c 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -52,9 +52,9 @@
 
 #Deathsquad Outfit
 - type: startingGear
-  id: DeadsquadGear
+  id: DeathSquadGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitColorBlack
+    jumpsuit: ClothingUniformJumpsuitDeathSquad
     back: ClothingBackpackDuffelSyndicateAmmo
     mask: ClothingMaskBreath
     eyes: ClothingEyesGlassesSecurity
@@ -62,7 +62,7 @@
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitDeathsquad
     suitstorage: YellowOxygenTankFilled
-    shoes: ClothingShoesChameleonNoSlips
+    shoes: ClothingShoesBootsMagAdv
     id: CentcomPDA
     pocket1: EnergySword
     belt: ClothingBeltChiefEngineerFilled
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..a905cb70de300ab0e5498b192a350185ca9ad805
GIT binary patch
literal 488
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`7zFr)xB_Vo
zP7ZBtZ7VA)dwcuf;NYyRtSM8b+`M^HkC{z|kvZZ&L&l-YbKk$y(lT*%4NZ=XiU;Zu
zC<*clX84Z^4g_>N1MTqgba4!cXni~Fb=F}6o>twzn<rfOz5i{>&6j2$Cc0mDlnhi<
zvsIs8)4llGyB&}3HmOJ}E)nkZh<W(==ZmauyL8wd1$&tIShHU&x!~x|_lxa@z$1Uv
zqOUpI847tDew9gy&6xUKGp)+paC)xzx`*GhmA37Y<~`t+zxTV_F~)?&dv3olWRq6D
z@j|=1AbpG1%H7u2iWgePJiCz?uFw$G&vRFV@ycg*Mwfz#^0o_BvG?~jl|)u^G8-LU
z&rob^vvNPP!=-@SB|-TzhWh7UmftBn{<`Tw<xj~UxpATnt9f{*v**gr5^a<dTM#eG
zz#{VXsJO$=x2qW!AJX`8W&$h6rNvAag%xz-_!<kFF1oIJo*=Wclz$oXi{tPApG+`Y
zc0u$iyRRv4TK(1L)rTBD`SV8DNgva?-q755V<(#oPiUht@72|xxDNb${9pcbGyh@>
Wp6X`jjeNimXYh3Ob6Mw<&;$U;l+ND(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0796e955f0e191dbff07a274a73146ea8cc7b275
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$5J^NqR9J=Wm9cKZFc5~nkS20=qz+|96%s5}mJUd5hmL&(UaAsfUxAUK<pCn5
zN{DoaDSM+L)eM!R5P9&WbfEZ~Y~T6*^ZA^B$KyG70*SLql<t;00AAOtYW?AQ06?K4
z%Fj|1QzYICLfs2OtrDe2VXX5!*P}4jO`9aHbGG%s-Ev2vBKlw7e8in<Zje;L$<cNy
zBia;~Ced+mGEC-KH7-=d^LBe6Ubnl_x&lV<<uSGHajihB9x#|5Xe$naD{u`eeTJeQ
zfS*%K){mAz{R*05^||yraN+7WnP;TKD*&?h4cy&udH)1&Gj12l1KV^wbWY%On$U(#
oT*|LrfvxfW>}TZhcs&1>JwX6-ghjK2NdN!<07*qoM6N<$f}3!b4FCWD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f645ca2a53a13eb5905e02eb00b5604bf8d99f
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`7zFr)xB_Vo
zP7ZBtZ7VA)dwcuf;NYyRtSM8b+`M^HkC{z|kvZZ&L&l-YbKk$y(lT*%4NZ=XiU;Zu
zC<*clX84Z^4g_>N1LZb(x;TbJw7#9Xk?)8BhjaF}1ulR8@3$4Yd+C^a^C~^tn9hSu
z(_8rNZ41$wTD4hWvE1G`mL;>#p1&LaOp5W=Z<oR^zxJ$SSdhiCk?VRfgYVW=p*!X|
zZ}{9bx0U<6Vu$JcZ%6kWXP9v5TbSSe!f$oV3He92G@tyu&S0On{#37}|6+A^CV!qd
zC!Jx^osB;oyow!EmTEHAR+%o;aO5daUwDiuk3nbY>p1b?SxiovXV*{Aw0+H7tIH~6
T&-B_2=z0cES3j3^P6<r_(20v@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d41493fe063efad031a98f3ff5447a719647edef
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`7zFr)xB_Vo
zP7ZBtZ7VA)dwcuf;NYyRtSM8b+`M^HkC{z|kvZZ&L&l-YbKk$y(lT*%4NZ=XiU;Zu
zC<*clX84Z^4g_>N1LZb)x;TbJw7#8skn6Akk8}2YC81yc>#djfIJO^p@^nk0W39(i
zcOmu?nWaH1zvOR<ykoL{ztz3#Du*tYewV8G*T{0<&E9I>j?n&JGadG}F_yT5GMvdi
zn0s(apTpjb%h@Wqj_l?($bT&3E2I4J*v>b<L>RsvdtLBW_URswftydcn7s9OF=1Cx
zn)Us);9iCof_oKiyt(!$)A0kt8<%sXjM2$Cf8Rv86gwy_3XfiK<F6P0j(e;^zlEp0
Q06Lz*)78&qol`;+0FuU#VE_OC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json
new file mode 100644
index 0000000000..b4ede7083e
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by KEEYNy (Github) for Space Station 14. contacts: https://github.com/KEEYNy  discord: KEEYN#3805",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}