From 2fbca67abfcf233bf15858ef0fba8dafad74c4e3 Mon Sep 17 00:00:00 2001
From: TadJohnson00 <tadjohnson00@gmail.com>
Date: Tue, 10 Oct 2023 00:47:52 +1000
Subject: [PATCH 1/2] Plate Carriers and Stabproof Vests

Replaces the vast majority of armour in organic play with Delta V variants which: A) look nicer, B) are specialised, C) are less cringe B-)
---
 .../Catalog/Fills/Lockers/security.yml        |   3 +-
 .../Catalog/Fills/Lockers/service.yml         |   2 +-
 .../Catalog/Fills/Lockers/wardrobe_job.yml    |   3 +-
 .../VendingMachines/Inventories/bardrobe.yml  |   2 +-
 .../VendingMachines/Inventories/sec.yml       |   3 ++
 .../VendingMachines/Inventories/secdrobe.yml  |   5 +-
 .../Entities/Clothing/OuterClothing/armor.yml |  44 ++++++++++++++++++
 .../Prototypes/Procedural/salvage_rewards.yml |   2 +-
 .../Roles/Jobs/Security/security_cadet.yml    |   2 +-
 .../Roles/Jobs/Security/security_officer.yml  |   2 +-
 .../Roles/Jobs/Security/senior_officer.yml    |   2 +-
 .../duravest.rsi/equipped-OUTERCLOTHING.png   | Bin 0 -> 957 bytes
 .../OuterClothing/Armor/duravest.rsi/icon.png | Bin 0 -> 708 bytes
 .../Armor/duravest.rsi/inhand-left.png        | Bin 0 -> 938 bytes
 .../Armor/duravest.rsi/inhand-right.png       | Bin 0 -> 874 bytes
 .../Armor/duravest.rsi/meta.json              |  26 +++++++++++
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 1146 bytes
 .../Armor/platecarrier.rsi/icon.png           | Bin 0 -> 832 bytes
 .../Armor/platecarrier.rsi/inhand-left.png    | Bin 0 -> 1091 bytes
 .../Armor/platecarrier.rsi/inhand-right.png   | Bin 0 -> 1131 bytes
 .../Armor/platecarrier.rsi/meta.json          |  26 +++++++++++
 21 files changed, 112 insertions(+), 10 deletions(-)
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/icon.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png
 create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index f127e3708b2..3c1d812b333 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -65,7 +65,8 @@
       - id: ClothingHeadHelmetBasic
       - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
         prob: 0.4
-      - id: ClothingOuterArmorBasic
+      - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest
+      - id: ClothingOuterArmorDuraVest
       - id: ClothingBeltSecurityFilled
       - id: Flash
         prob: 0.5
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index e86c09de2ae..e75303c8d7e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -5,7 +5,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorBasicSlim
+      - id: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
       - id: WeaponShotgunDoubleBarreledRubber
       - id: DrinkShaker
       - id: ClothingEyesHudBeer
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
index d5fe4159326..cd13ff4f650 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -160,7 +160,8 @@
        - id: ClothingShoesBootsJack
        - id: ClothingEyesGlassesSecurity
        - id: ClothingHeadHelmetBasic
-       - id: ClothingOuterArmorBasic
+       - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest
+       - id: ClothingOuterArmorDuraVest
        - id: ClothingUniformJumpskirtSec
 
  - type: entity
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
index 1e42faff3e4..539a0a68fee 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -11,7 +11,7 @@
     ClothingUniformJumpskirtBartender: 2
     ClothingUniformJumpsuitBartenderPurple: 2
     ClothingShoesColorBlack: 2
-    ClothingOuterArmorBasicSlim: 2
+    ClothingOuterArmorDuraVest: 2 # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index c6ce01d127d..b2044179f22 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -14,6 +14,9 @@
     RiotBulletShield: 2
     ClothingHeadHelmetInsulated: 2 # Nyanotrasen - Insulative headgear
     ClothingHeadCage: 2 # Nyanotrasen - Insulative headgear
+    ClothingOuterArmorPlateCarrier: 2 # DeltaV - moved body armour from SecDrobe to SecTech
+    ClothingOuterArmorDuraVest: 2 
+    ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
   # security officers need to follow a diet regimen!
   contrabandInventory:
     FoodDonutHomer: 12
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index 59e6d62ac65..04f566b3b0a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -17,7 +17,8 @@
     ClothingUniformJumpsuitSecBlue: 3
     ClothingHeadsetSecurity: 3
     ClothingOuterWinterSec: 2
-    ClothingOuterArmorBasic: 2
-    ClothingOuterArmorBasicSlim: 2 
+    ClothingOuterCoatGreatcoat: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times.
+##    ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech
+##    ClothingOuterArmorBasicSlim: 2 
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml
new file mode 100644
index 00000000000..a57d550ef4b
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml
@@ -0,0 +1,44 @@
+#Basic armor vest replacement
+- type: entity
+  parent: ClothingOuterBaseMedium
+  id: ClothingOuterArmorPlateCarrier
+  name: plate carrier
+  description: A large and bulky carrier featuring steel plates that offer decent protection against gunfire.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi
+  - type: Armor # Good against gunshots, decent against everything else. Balanced by reduced movement speed.
+    modifiers:
+      coefficients:
+        Blunt: 0.80
+        Slash: 0.80
+        Piercing: 0.50
+        Heat: 0.80
+  - type: ClothingSpeedModifier
+    walkModifier: 0.90
+    sprintModifier: 0.8
+  - type: ExplosionResistance # More protective against explosives than you think. Helps in preventing all those vital organs from jiggling around o.o
+    damageCoefficient: 0.70
+
+#Alternate / slim basic armor vest replacement
+- type: entity
+  parent: ClothingOuterBaseMedium
+  id: ClothingOuterArmorDuraVest
+  name: durathread vest
+  description: A tight-fitting and sturdy armor vest, reinforced with durathread weave to protect against sharp objects and blunt force trauma.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Armor/duravest.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Armor/duravest.rsi
+  - type: Armor # Good against stabs and knocks, offers minimal protection from gunshots and lasfire.
+    modifiers:
+      coefficients:
+        Blunt: 0.60
+        Slash: 0.60
+        Piercing: 0.90
+        Heat: 0.90
+  - type: ExplosionResistance # Better than nothing against a blast or shockwave.
+    damageCoefficient: 0.90
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index 763ae8bd4e1..f5080069fb4 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -44,7 +44,7 @@
     MakeshiftShield: 0.25
     # rare armor
     ClothingHeadHelmetSwat: 0.25
-    ClothingOuterArmorBasicSlim: 0.25
+    ClothingOuterArmorPlateCarrier: 0.25 # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of plate carrier
     # rare weapons
     WeaponMakeshiftLaser: 0.1
     # money
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 1d684a0077a..82021b016ad 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -25,7 +25,7 @@
     jumpsuit: ClothingUniformJumpsuitColorRed
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
-    outerClothing: ClothingOuterArmorBasic
+    outerClothing: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasic replaced in favour of stab vest. Sucks to suck, cadets
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
 #    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index a0bb8978ab5..30706b4bdee 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -26,7 +26,7 @@
     shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHelmetBasic
-    outerClothing: ClothingOuterArmorBasic
+    outerClothing: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier
     id: SecurityPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
index 3a93d9a321b..b3abb594b07 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -36,7 +36,7 @@
     shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHatBeret
-    outerClothing: ClothingOuterArmorBasic
+    outerClothing: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier
     id: SeniorOfficerPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e7b85c157933450b4d93416a4ba926ec3206b7
GIT binary patch
literal 957
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd6
z#IgFU)R}^T&MwW(uFZ`iF3A#4l6bQwTwQd1{ek||d%aw;FI*BZanY^i{mZ_UZ7r)~
z0E=Mm+ge@4?cXyNw9Grb^L_vGInSTYdEQ_<<?^Sr+47%SCkgVg*?4bE?f=Xx9$Rvu
z-FV&1Uo|OuUZ+3)ZScMNyYTAjultrQww`HZx}lWIKXX^0&^$rDwbM(ES|4JLGMgu2
zC-zOU$l;;%QuVAqt1N;a`yX{PvEeSedU<l@0~hA(NM(H+wKr#<pSpFw@`~@Bm4}jC
zUQIZY=yQmL^MRt{Ow*z%64Rq5oSF6ePw0In*N+*WuHQT$;NG^TqIS`=rP*FtQD3Ii
zSek{r`~TVG@?_zy@7^(N*&lK3IETge1)H)X?bWA+TCyHDjuCzJZ_yKzzpB6TVn53{
zz88y$xxV#?T}<BL2b1N@ABCP&ygbkE@Ndg6M;83&i_zY?=HE5T>XsMFY%c1`$Q)Yn
z=6&p6)~OlkH`m0pJqJbrXMsm#F#`j)5C}6~x?A@L7#&|dT^vIy7~jr1>&0v+(&}Cq
z9bL<C@sVGQ$icM_4t=j@Sow%Kqh4;oIrD;clXFV{T`d~7O*S}b`SY3Dl#_3*L<I#H
z5r{*nVEZ2XJ$v@a-kH7f^1E$Ucj>LI7tH?htn6lO?YjP5fy@6U|E;?cw>at7>gCS`
zEBfk87=)u^V*A<jo_E^^Wckc9^sP6W-7jSM>mtLi&hn1kYz0o$-ATXJiNytdJ%6{+
zX`Q+K{kwJhZFfzzdaLV|`FFF#<s64Kj{jd8vk7pVuaobP`h4YAprFHyx7%i)<XB*9
z%Hynf<w8G`!;g&*e+W9v{dVj0g0{Mn9e%paVh`WDoxD=tcV($KFN3lw?+)S1TRA!!
z@S!WJ6TU{xnJmSp9d!TXbHCo}pPw~u460FKG<dwOQKV2>{pt28Wnv6HyWLh?XKR$R
z`u3#w>!NdPg5SC&D=K0_?PXkNcP@4{e7kVckEy&2vELZ&(-kiI2W+48ljEYK(mH2u
z_tTOOI`+6eG?6;HkLR?ay3i&DfxanW!tzIc=_@S=v2zk*IL&V1%EHjxGv$uZR`wk$
zGdYB-Y78z_@oy-RvHw%szq6s~_h$JU^91f_K0Fp?#d+<DD~pQ*5_%vn_=7e1ICJ@a
T;cQ!As$lSR^>bP0l+XkK(Cw{%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8308a990ba31dcfac4e43cad5e97c87a4277673b
GIT binary patch
literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGs)bQA0$7gGGaZ6hvbf<YEnKkkz8sufUJXy-GxD(9#ezL@j*{
z{Rg!Mtp!0)1QBiReJvrk_h_Jmp3AxKkLR4{<(%h$J(Sb(W}6@Kg_02t20Tl#Wsma>
z7hQDFhcm93`g~+AO3U&6fKAo=an-B!zNVu)nKCu7bqY^ux=|9I5e}`Fbj3Tu16nqo
z6h0RA8FE138>J^|{Hi!p<4?s#G&~D-)zgz{;6wv!StBnzChX1U%G%#~)J@!}!eT_~
zkj!CB!UPH6Awiina+DaCT9C||`}|ek0!8s?^4HnG5J!frczvRlrE5xRTJ)5BIW|=8
z|MN7{lM}V>?f|sESk}h~IQO8kYgs=hmQ^_g$1_|N>i(kSH2o#|Ze8;pLGKn^T-UY4
zK3s0Y;FBIV;#J8Z)1FSl`#JQ)p#KhBE48ft);W8G=%zf;EgT%esO;}u{RNe1XW6V=
zhUWkP010qNS#tmY3labT3lag+-G2N4008_+L_t(o3GI_n4uU`oM62-^K@VV*c>fa_
zFdjfb4xkRP$+B$S)*oZiCS*;!Wro*E<lzLIfD`yP0*CtekUW2?Nj*!cAmw-ano>f@
zp=J%U0jognzS+R#+)(OEkweWIW&@ItWGrWBmAeqvS*Y4<C(F1ltFH){4ZMV@D9Z7P
z&7o!u^9Z`zm4>08=^%%iH5QtN@Nb750D)A%M7W4;bIQJ7Jp$mxobP=%YR4uZjv5T&
z)Y4FofW>jf;&6mqcqc_Dl~WOTqnvDgY=Q~k%kgON!%%icv1{xDk0Y!xcC9e?nhl^a
qTuOcsPOEs>>%X0V6L11QBk%-;Ph`oQxc3$S0000<MNUMnLSTZk6-LDX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..25d2e0a25e9b99f6f22e5e8f9942250d4cc81769
GIT binary patch
literal 938
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd6
z#IgFU)R}^T&MwW(uFZ`iF3A#4l6bQwTwQd1{ek||d%aw;FI*BZanY^i{mZ_UZ7r)~
z0E=Mm+ge@4?cXyNw9Grb^L_vGInSTYdEQ_<<?^Sr+47%SCkgVg*?4bE?f=Xx9$Rvu
z-FV&1Uo|OuUZ+3)ZScMNyYTAjultrQww`HZx}lWIKXX^0&^$rDwbM(ES|4JLGMgu2
zC-zOU$l;;%QuVAqt1N;a`yX{PvEeSedU<l@0~hA(NM(H+wKr#<pSpFw@`~@Bm4}jC
zUQIZY=yQmL^MRt{Ow*z%64Rq5oSF6ePw0In*N+*WuHQT$;NG^TqIS`=rP*FtQD3Ii
zSek{r`~TVG@?_zy@7^(N*&lK3IETge1)H)X?bWA+TCyHDjuCzJZ_yKzzpB6TVn53{
zz88y$xxV#?T}<BL2b1N@ABCP&ygbkE@Ndg6M;83&i_zY?=HE5T>XsMFY%c1`$Q)Yn
z=6&p6)~OlkH`m0pJqJbrXMsm#F#`j)5C}6~x?A@L7#)v1T^vIy7~js?@5SsW(Ek01
znc6RgMF;(Kni8}lA~?hBmQGDbRa_!^M0~;z_FPj#{(^V;lc%0NdGKwTzfukJ^xHby
z_s{&Bmp5B7*?_}=fk~i&fklCV5rvr$%JJsg_fy-FBhSBdV9bC2<?Qv87@IryEi=#B
z_R4if*vFk-_gR1|bH81G&(-d!t84AF8}2=u_OfKxJE4ZnpSwT(eS7rASr_)VTfgzM
z*;O=Zn9RStiBUpEZtCOn{F^Vn<#fn2&tG=A^Wq%dTdem@K6FisR$Ke<t#5GWvGcCW
z)8=mSk4$yQ;HsIot+)1SX5?L^3*2{A`ZuRG?ECz4cG>&}rJxPpYy#L!?(MmDHFIqV
zn?}LRd-rloe*0Q7{Qb3R+Fbo2xrTfE<tTo_>Qfhi4XHZeV%Bz+e?#TECv;YAiL&zk
zICrVVs-TL5)OS*K3-%gJk^ia?6Cb<l(dtv5HtxGFCL;WQ1=kzj<gY9%j=g_=YsYUn
zrk}zrv6}lfGtBtTvV%8!O_-Qt#^ojY_KEgRUGH@mR!J_H*N}SZk?#S|__}FdWv}iC
z5TC*4kZrGd|J$>}7OU7F#{c4boWKK)gZ~o`n16CTB)xs>{;R+wz~JfX=d#Wzp$PzK
Cb);ed

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..96af6670c7f56daef172d5d40115a324a1bf1248
GIT binary patch
literal 874
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd6
z#IgFU)R}^T&MwW(uFZ`iF3A#4l6bQwTwQd1{ek||d%aw;FI*BZanY^i{mZ_UZ7r)~
z0E=Mm+ge@4?cXyNw9Grb^L_vGInSTYdEQ_<<?^Sr+47%SCkgVg*?4bE?f=Xx9$Rvu
z-FV&1Uo|OuUZ+3)ZScMNyYTAjultrQww`HZx}lWIKXX^0&^$rDwbM(ES|4JLGMgu2
zC-zOU$l;;%QuVAqt1N;a`yX{PvEeSedU<l@0~hA(NM(H+wKr#<pSpFw@`~@Bm4}jC
zUQIZY=yQmL^MRt{Ow*z%64Rq5oSF6ePw0In*N+*WuHQT$;NG^TqIS`=rP*FtQD3Ii
zSek{r`~TVG@?_zy@7^(N*&lK3IETge1)H)X?bWA+TCyHDjuCzJZ_yKzzpB6TVn53{
zz88y$xxV#?T}<BL2b1N@ABCP&ygbkE@Ndg6M;83&i_zY?=HE5T>XsMFY%c1`$Q)Yn
z=6&p6)~OlkH`m0pJqJbrXMsm#F#`j)5C}6~x?A@L7#)i|T^vIy7~jr1@5O8=&>s9T
zD!P{8;v?TGji&H}&FTjy`@i)3pvm%*yJMeY?px+He|33|Ovv37vU_D+W9ng*nfCE*
zF==y>9T=Dd8W>m<7#KNFnf0v)UcOl4b#&A9Es8cZrM1DWo0e^kJ^gg~zQ>a%djH&W
z|H+#VA5Pr8cQ@R>pWpWF%kS)dn=ZB2e5>{ODRZ{r<k3{q|1)+zEedp=5Oh}c@~r#?
zTXz20GVyV-NCQ*ouNT*HGxTO&^ODQ0?PIE_uYOyr_pFpHV#6ZMnb&;69@(F1m~uY5
znNxnkrRM9cZx)?bRTHvv#N|?m`y1>16m+aP-F?1E&p6ZfxBisd77Hn@_^HRUCw}F*
zvFp^cmA`hsz56A9+xg>@eM4)l@83{(_&(_9)haeVw!^#99bVV{t^M_B&$bJ%UT0f>
z&;9-M{kE#4-<ypb+;+c_<j8H0RoHl-C^eFy<Z|pco+CNW*=F3DK6Tsbc6WxX*oVqn
r&dy`J|IO^}GKEci;E>$y^?=*+;pXb*%cs`^qmaSV)z4*}Q$iB}WJ8oq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/meta.json
new file mode 100644
index 00000000000..1253f8b4e63
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Original work by TJohnson.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..510e28624f8fef780be7c816551a9d6b6ac9b54f
GIT binary patch
literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGs)bQA0$7gGGaZ6hvbf<YEnKkkz8sufUJXy-GxD(9#ezL@j*{
z{Rg!Mtp!0)1QBiReJvrk_h_Jmp3AxKkLR4{<(%h$J(Sb(W}6@Kg_02t20Tl#Wsma>
z7hQDFhcm93`g~+AO3U&6fKAo=an-B!zNVu)nKCu7bqY^ux=|9I5e}`Fbj3Tu16nqo
z6h0RA8FE138>J^|{Hi!p<4?s#G&~D-)zgz{;6wv!StBnzChX1U%G%#~)J@!}!eT_~
zkj!CB!UPH6Awiina+DaCT9C||`}|ek0!8s?^4HnG5J!frczvRlrE5xRTJ)5BIW|=8
z|MN7{lM}V>?f|sESk}h~IQO8kYgs=hmQ^_g$1_|N>i(kSH2o#|Ze8;pLGKn^T-UY4
zK3s0Y;FBIV;#J8Z)1FSl`#JQ)p#KhBE48ft);W8G=%zf;EgT%esO;}u{RNe1XW6V=
zhUWkP010qNS#tmY3labT3lag+-G2N400Oc}L_t(|0qvT>OXENk#z$FtDhT2tyB=Jm
zh`1u_aW9_zlRbO!DvOGUEbc)Uu?k90MXCKlzc7TE*q6*igm0iE^IkIFd%w&~N?)B*
z69Ewr0TB=Z5fA|p5P^3I?Ck!U{MZ;wLKnggf5?~0mP3Eh65MDsa^Kh1T@?cQu*09T
z<<S3P3HbW&)xz}pBH3QAS3d2PuixD5%|AEuTZS}Un?v6OfYA=`|GVG&2kg4zqr>vN
zi<6Z4rX_&nrcb^|{^{|~@dFsJchOSon*ea_Bk|YQm-2%?8vVIJ#Ppl!ngC#<Lqqa@
zW1oKCm-3u|smHO|r=RwDj;1}}`RSn;^I<p)j!l2inZO9ZSpTsG|8%2_xr25SfYU!G
z3wRfYg238@Kd6$(NWdu{fC&Ke*xuQ5OUtY57MtPK<yqO!d2)GiUc8E{8n8F{BG%}M
zL1?h~vy1`B=YIO7SmKjLGXODg<4GJ(=fgFc0f^F{ZlCq(cTQV^A|L`HAOa#F0wN#+
zA|L`HAOa#F0wN#+BJlA9%)bfx)fW^Zx~K}rFd-Jkz-z1(YSXX65UdCk0ZhfKcE*$K
z=qK;T6o|1l2J;N4j^+n~>d>rkQN1i#e{*YlG9HhMKWe0yeRCH_AsosA^brWl*0JkC
z_gZZjo2B@=<SjAG4WKSqCeJc?-L-9f&>)1iW8r?&9#9p;^rwwAd-ii3QIR5O>ic_u
zRkzg)==b}@T7+nqr7~*a4S*Qhv{o~K<#GfND_OS*E_AQ2gK~MNWx3eqf;u65F@GqL
zrZ(#MwMl<0YYe6(Q1^<%e+IA_=5Ek{R;<;<7`n#<AT$7McrRmJ;+VUo)=B~ZN&9Ov
zH-wa0tu{d>I-7RoE0OkGNBl?0I@NQ<qH#q)1VlgtL_h>Y;L{R#1NI?eUF%(RmH+?%
M07*qoM6N<$f~b5V-2eap

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..20b61f12ab2371a9ce132831627bc53ca6554a9b
GIT binary patch
literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGs)bQA0$7gGGaZ6hvbf<YEnKkkz8sufUJXy-GxD(9#ezL@j*{
z{Rg!Mtp!0)1QBiReJvrk_h_Jmp3AxKkLR4{<(%h$J(Sb(W}6@Kg_02t20Tl#Wsma>
z7hQDFhcm93`g~+AO3U&6fKAo=an-B!zNVu)nKCu7bqY^ux=|9I5e}`Fbj3Tu16nqo
z6h0RA8FE138>J^|{Hi!p<4?s#G&~D-)zgz{;6wv!StBnzChX1U%G%#~)J@!}!eT_~
zkj!CB!UPH6Awiina+DaCT9C||`}|ek0!8s?^4HnG5J!frczvRlrE5xRTJ)5BIW|=8
z|MN7{lM}V>?f|sESk}h~IQO8kYgs=hmQ^_g$1_|N>i(kSH2o#|Ze8;pLGKn^T-UY4
zK3s0Y;FBIV;#J8Z)1FSl`#JQ)p#KhBE48ft);W8G=%zf;EgT%esO;}u{RNe1XW6V=
zhUWkP010qNS#tmY3labT3lag+-G2N400DSOL_t(o3GGrnO9Md=orqj@Ac!Jrp@{eq
z3?fzvrm^uS+t?^*B_fgdfru6=;zfvDbr{sQILGXHadx+Lx5(Yjym{~4%MisA6Nm}K
z1RN8XUs(Kfgpv<-#Dx@uGqZC}#6DPPs|G-rrYSu=K9FXD#eu~P?%D_bX@JG^Jg57+
z+lDl;y|Y`A<6Vjaiy0Ra4b35lLC823%3hzjWS$d~(<Y@VR^F|FpG!$x*Q~4IYazbX
z-m}^#hx-H*$43WVoL*ol-hX?s42+FWQHY6Ai)F|KvC9_32ZIk;B58>6TKphT4S=k*
zzG=id=ckk;$uDs<*$@_$@!w@@e+)_GM>T*=?q!)7gSd8pVLWEFqZ$Cgd%tIRKwcC@
zDNsia4CCwi)tc85^6=71)7lBH-&}RQ`J5790r_mMZ4fpe2MgG}IFoJX_h189I^KL<
zKxb6}^p1>Y@i#25w#@bVvO^*9Ggt5vCWh@pFlii&3B&~cT>@W>BBgY-y-`sB0000<
KMNUMnLSTY_!hN#<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..89f8fe5ca2f87feaf14912ef278c588cca23dd7e
GIT binary patch
literal 1091
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd6
z#IgFU)R}^T&MwW(uFZ`iF3A#4l6bQwTwQd1{ek||d%aw;FI*BZanY^i{mZ_UZ7r)~
z0E=Mm+ge@4?cXyNw9Grb^L_vGInSTYdEQ_<<?^Sr+47%SCkgVg*?4bE?f=Xx9$Rvu
z-FV&1Uo|OuUZ+3)ZScMNyYTAjultrQww`HZx}lWIKXX^0&^$rDwbM(ES|4JLGMgu2
zC-zOU$l;;%QuVAqt1N;a`yX{PvEeSedU<l@0~hA(NM(H+wKr#<pSpFw@`~@Bm4}jC
zUQIZY=yQmL^MRt{Ow*z%64Rq5oSF6ePw0In*N+*WuHQT$;NG^TqIS`=rP*FtQD3Ii
zSek{r`~TVG@?_zy@7^(N*&lK3IETge1)H)X?bWA+TCyHDjuCzJZ_yKzzpB6TVn53{
zz88y$xxV#?T}<BL2b1N@ABCP&ygbkE@Ndg6M;83&i_zY?=HE5T>XsMFY%c1`$Q)Yn
z=6&p6)~OlkH`m0pJqJbrXMsm#F#`j)5C}6~x?A^$fq|*o)5S5Qg7NJvd+);z62}&M
zEN^<C^kP9rhluNulSgm51_;Q=-1);$Ct%+&`~IPuM=v_AtQWYruxpE0i{DY9TE6>5
za^ka}+;f@ue8H1<ld9)^uRE#Q`h8JHD~m@14y3@}_;Th=i}O3~%NZ{cWKgp=v=j~1
zn)>70F1wWMM|TeYy}RA+cTG^NN%YzD;?C8xP4u$spB;!{W{FxGwm5IQ^xAc6XJ0<<
z-tJbOw@+-by?%rLf?8jW?sd}69??%ZH!xRZ?{}Gfdv}^;PhYQl`f~MeFRzr&wE5Dd
zb9mvS9lPiH9Y3LPBkuj)|J=Oyu5$NYHMf&sn0DaNrLK#|p1ggu?QL=9tA&p*SFF%!
zydHMC;-q13;jHW}Uu))RF(~v*pSx#cty|?UAm5NhpRvQvRPJ~FuUm(TTISaXeyZD-
zB2(gW*}U<>z6a_D{vJ8GE7x3l;l`OCqpUm+vM_IG-T!XZEBiyUS92#T`nSA2ZpAr)
z0XI4juh38uDOvcVrl!{Z=%Psy8+j)P9gk~V(|AKF^VNm+{^(6rtC?=xw(ppDQd4<p
zYv*D1c}$F@UlR8_-I87~OJZV)g~F4&;tG=`OSXLHKT+4>m|XMxDnm}r+ar_2gaz!J
z&)VIzSD5vv`!84CDZh1v{j0nkj<B|D>9*Qscj;JN>!s-qk~?d}QzoSc?YEZ8-KrXJ
zt^54Emh-~DMK+0;GMsq0_{6ali#G4Pa9mwnKPK|`*VDz3zyInVR*=YINck%|_k6kf
zlh5A2nOed=*g0A&+!4$a|I2dV_&4X>JpMm6{849;{}#;^R@LIZ1ei7%JYD@<);T3K
F0RW0*{{jF2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0af766ef96591293cb93b41f80582ccece652a39
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGs)bQA0$7gGGaZ6hvbf<YEnKkkz8sufUJXy-GxD(9#ezL@j*{
z{Rg!Mtp!0)1QBiReJvrk_h_Jmp3AxKkLR4{<(%h$J(Sb(W}6@Kg_02t20Tl#Wsma>
z7hQDFhcm93`g~+AO3U&6fKAo=an-B!zNVu)nKCu7bqY^ux=|9I5e}`Fbj3Tu16nqo
z6h0RA8FE138>J^|{Hi!p<4?s#G&~D-)zgz{;6wv!StBnzChX1U%G%#~)J@!}!eT_~
zkj!CB!UPH6Awiina+DaCT9C||`}|ek0!8s?^4HnG5J!frczvRlrE5xRTJ)5BIW|=8
z|MN7{lM}V>?f|sESk}h~IQO8kYgs=hmQ^_g$1_|N>i(kSH2o#|Ze8;pLGKn^T-UY4
zK3s0Y;FBIV;#J8Z)1FSl`#JQ)p#KhBE48ft);W8G=%zf;EgT%esO;}u{RNe1XW6V=
zhUWkP010qNS#tmY3labT3lag+-G2N400N^)L_t(|0qvU4OT#b}$1{<gcGQD<P((zA
zBI3!5Xa8i+Ui<?De<7lWDY7{bb{fj;H}r+rHR;>Bt`)uyM$_aa@0(AX6!u~ajRZ)5
z1W14cNPq-LfCNZ@1W14cNPq-LfCNY&Mqp=mZxU<&Z*8j~!I<dF^HXd8pzFI#*48(0
zZ`=HaI?IVxv$?fx2K{%DVILB-zV%)W<{=H)Yp?+T+U>SEJHHSgJLvV*r9u5@G>Q(K
z4OG=VCg16F%y>M8R)leHD72zJ24E#5ES<dh8h%XDU&ysl^@&z!wm$&DJYp6EfKC|b
z=jYq~a1U$B(}$Mi=~_J~hxDQ?WKjT^yl--UbbM;CMEth8%2)!>0~39sC3`RR{x!G>
z!s&A`@O@o5RPP*?To65Soh5t}fVZo<F|nyM(V#0&Z;{sE5_r77wYxtylJ4P&{b4Zd
zsQ9!r$<j}ql_XlzFM^SIg!D$=0CXDmdsBU5pOq=+iYu@Q`X=i>Pq*(U<w5`tcQ@i&
zNYgpiR7jpSBIC_%#0Fgx28Ja85+DH*AOR8}0TLhq5+DH*AOR8}0TLhq5+H#E5y(r2
z<<%`H+@E3c;vg+n)(Za?mjDoe9DFw0x{UJzUTpl`E$MoL*x9^*=+$0T03ZN4c%+_^
zjEgT~f*kxZERBs&F8(572UBCQNhN7$cV<A7gO81+Y4gr1xZJ;{pT<W80I4vX34qO$
zgVzWt^2x--11RdEYF7ck5-5{{S1BoQlANEoW$&ea)~jj{z@U<Qm+P#7%KBFoR}BCY
zm^TMscJk<-m-}DDSq0S+fB^rv*{nHu^e<zQ<Ig#(P-a-$SM>&D&jZN%)8^nyt4s%|
xBAyC>KY{dV)RKSq&MLIhvjDy{mPud^0>4f{RQY<h;g$dZ002ovPDHLkV1f>Z2?YQE

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json
new file mode 100644
index 00000000000..1253f8b4e63
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Original work by TJohnson.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From adbd07a342ef3c9a39436c868ac8771fcce9f860 Mon Sep 17 00:00:00 2001
From: TadJohnson00 <tadjohnson00@gmail.com>
Date: Tue, 10 Oct 2023 01:24:53 +1000
Subject: [PATCH 2/2] Adds Resistances to Winter Coats

Captain's winter coat and security winter coat are updated, greatcoat updated to match sec winter coat
---
 .../Entities/Clothing/OuterClothing/coats.yml      |  8 ++++----
 .../Clothing/OuterClothing/wintercoats.yml         | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
index 66299a63c74..93b17ad4c37 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
@@ -65,12 +65,12 @@
     sprite: DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi
   - type: TemperatureProtection
     coefficient: 0.1
-  - type: Armor
+  - type: Armor # MAKE SURE THE STATS ALIGN WITH SEC WINTER COAT!!!
     modifiers:
       coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.6
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
         Heat: 0.75
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 6fd41ab6f6c..43ea9eaba66 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -81,6 +81,13 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterCaptain
+  - type: Armor # DeltaV - adds resists to coat, same as security winter coat. Still better than nothing, but nowhere as good as a carapace
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.75
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable
@@ -392,6 +399,13 @@
     sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterSec
+  - type: Armor # DeltaV - adds resists to coat
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85 # DeltaV - not as resistant as pre-rebase, but still better than nothing
+        Heat: 0.75
 
 - type: entity
   parent: ClothingOuterWinterCoatToggleable