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/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 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 00000000000..e9e7b85c157 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png differ 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 00000000000..8308a990ba3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/icon.png differ 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 00000000000..25d2e0a25e9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png differ 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 00000000000..96af6670c7f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png differ 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 00000000000..510e28624f8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png differ 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 00000000000..20b61f12ab2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png differ 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 00000000000..89f8fe5ca2f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png differ 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 00000000000..0af766ef965 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png differ 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 + } + ] +}