From 763a8af375e45efefcd74b51724a86fe5ef21070 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 5 Jul 2023 18:03:15 -0500 Subject: [PATCH] =?UTF-8?q?Major-ish=E2=84=A2=20armor=20rebalance,=20adds?= =?UTF-8?q?=20basic=20security=20armor=20and=20removes=20Kevlar=20armor=20?= =?UTF-8?q?(#17825)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adds basic armor vest & changes sec backpack sprites to tg * el armor de dode * abcd * el fixe * boner balls * armor rebalance * dode --- .../Catalog/Cargo/cargo_security.yml | 2 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 2 +- .../Catalog/Fills/Lockers/security.yml | 2 +- .../Catalog/Fills/Lockers/service.yml | 2 +- .../Catalog/Fills/Lockers/wardrobe_job.yml | 2 +- .../VendingMachines/Inventories/bardrobe.yml | 2 +- .../VendingMachines/Inventories/secdrobe.yml | 2 + .../Clothing/Head/hardsuit-helmets.yml | 128 ++++++++++-------- .../Entities/Clothing/Head/helmets.yml | 51 ++++--- .../Entities/Clothing/OuterClothing/armor.yml | 117 ++++++++++------ .../Entities/Clothing/OuterClothing/coats.yml | 33 +++-- .../Clothing/OuterClothing/hardsuits.yml | 48 ++++--- .../Entities/Clothing/OuterClothing/vests.yml | 54 ++------ .../Clothing/OuterClothing/wintercoats.yml | 27 ++-- .../Roles/Jobs/Civilian/bartender.yml | 2 +- .../Roles/Jobs/Command/centcom_official.yml | 2 +- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 10 +- .../Roles/Jobs/Fun/misc_startinggear.yml | 10 +- .../Roles/Jobs/Security/security_cadet.yml | 1 + .../Roles/Jobs/Security/security_officer.yml | 2 +- .../security.rsi/equipped-BACKPACK.png | Bin 879 -> 557 bytes .../Back/Backpacks/security.rsi/meta.json | 2 +- .../security.rsi}/equipped-OUTERCLOTHING.png | Bin .../security.rsi}/icon.png | Bin .../security.rsi}/inhand-left.png | Bin .../security.rsi}/inhand-right.png | Bin .../security.rsi}/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin 0 -> 428 bytes .../Armor/security_slim.rsi/icon.png | Bin 0 -> 277 bytes .../Armor/security_slim.rsi/inhand-left.png | Bin 0 -> 374 bytes .../Armor/security_slim.rsi/inhand-right.png | Bin 0 -> 368 bytes .../security_slim.rsi}/meta.json | 2 +- .../kevlar.rsi/equipped-OUTERCLOTHING.png | Bin 1145 -> 0 bytes .../OuterClothing/Vests/kevlar.rsi/icon.png | Bin 336 -> 0 bytes .../Vests/kevlar.rsi/inhand-left.png | Bin 352 -> 0 bytes .../Vests/kevlar.rsi/inhand-right.png | Bin 344 -> 0 bytes Resources/migration.yml | 6 +- 37 files changed, 272 insertions(+), 237 deletions(-) rename Resources/Textures/Clothing/OuterClothing/{Vests/oldarmor.rsi => Armor/security.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/Clothing/OuterClothing/{Vests/oldarmor.rsi => Armor/security.rsi}/icon.png (100%) rename Resources/Textures/Clothing/OuterClothing/{Vests/oldarmor.rsi => Armor/security.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/OuterClothing/{Vests/oldarmor.rsi => Armor/security.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/OuterClothing/{Vests/kevlar.rsi => Armor/security.rsi}/meta.json (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/inhand-right.png rename Resources/Textures/Clothing/OuterClothing/{Vests/oldarmor.rsi => Armor/security_slim.rsi}/meta.json (85%) delete mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index b0d1a26e0e..e2dcd11ba6 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -1,7 +1,7 @@ - type: cargoProduct id: SecurityArmor icon: - sprite: Clothing/OuterClothing/Vests/oldarmor.rsi + sprite: Clothing/OuterClothing/Armor/security.rsi state: icon product: CrateSecurityArmor cost: 700 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 63fe728b81..f3bcd56550 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -142,7 +142,7 @@ - id: ClothingShoesBootsJack - id: ClothingHandsGlovesColorGray - id: ClothingHeadsetService - - id: ClothingOuterVestKevlar + - id: ClothingOuterArmorBasic - id: Paper - id: Pen - id: CentcomPDA diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index db2306136a..2ed6bef94a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -59,7 +59,7 @@ - id: ClothingUniformJumpsuitSecGrey prob: 0.3 - id: ClothingHeadHelmetBasic - - id: ClothingOuterArmorBulletproof + - id: ClothingOuterArmorBasic - 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 75dfcc2de4..c649540d8b 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: ClothingOuterVestKevlar + - id: ClothingOuterVest - id: WeaponShotgunDoubleBarreledRubber - id: DrinkShaker - id: ClothingEyesGlassesBeer diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index a256147227..d3c6d23572 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -160,7 +160,7 @@ - id: ClothingShoesBootsJack - id: ClothingEyesGlassesSecurity - id: ClothingHeadHelmetBasic - - id: ClothingOuterVestKevlar + - id: ClothingOuterArmorBasic - id: ClothingUniformJumpskirtSec - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 7315571280..1f329ea919 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -10,6 +10,6 @@ ClothingUniformJumpskirtBartender: 2 ClothingUniformJumpsuitBartenderPurple: 2 ClothingShoesColorBlack: 2 - ClothingOuterVestKevlar: 2 + ClothingOuterVest: 2 ClothingBeltBandolier: 2 ClothingEyesGlassesSunglasses: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 4a8e5acf57..0bc70b5887 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -15,5 +15,7 @@ ClothingUniformJumpsuitSecBlue: 3 ClothingHeadsetSecurity: 3 ClothingOuterWinterSec: 2 + ClothingOuterArmorBasic: 2 + ClothingOuterArmorBasicSlim: 2 ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index a33ee781f2..37dac38182 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -1,4 +1,6 @@ #When adding new hardsuits, please try to keep the organization consistent with hardsuit.yml (if possible.) +#For now, since locational damage is not a thing, all "combat" hardsuits (with the exception of the deathsquad hardsuit) have the equvilent of a helmet in terms of armor. This is so people don't need to wear both regular, on-station helmets and hardsuits to get full protection. +#Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor outside of the above scenario. #CREW HARDSUITS #Standard Hardsuit @@ -13,15 +15,6 @@ sprite: Clothing/Head/Hardsuits/basic.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/basic.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - Radiation: 0.9 - Caustic: 0.9 #Atmospherics Hardsuit - type: entity @@ -60,14 +53,6 @@ - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 10000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.90 - Piercing: 0.95 - Heat: 0.6 - Radiation: 0.5 - type: TemperatureProtection coefficient: 0.005 @@ -139,12 +124,6 @@ - type: PressureProtection highPressureMultiplier: 0.525 lowPressureMultiplier: 10000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - type: PointLight radius: 7 energy: 3 @@ -169,9 +148,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Brigmedic Hardsuit - type: entity @@ -220,9 +200,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Captain's Hardsuit - type: entity @@ -314,9 +295,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #ANTAG HARDSUITS #Blood-red Hardsuit @@ -339,11 +321,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 - Radiation: 0.5 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Cybersun Juggernaut Hardsuit - type: entity @@ -360,6 +341,13 @@ - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Syndicate Elite Hardsuit - type: entity @@ -383,11 +371,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.2 - Radiation: 0.5 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Syndicate Commander Hardsuit - type: entity @@ -409,11 +396,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.8 - Radiation: 0.5 + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Wizard Hardsuit - type: entity @@ -432,6 +418,13 @@ - type: PressureProtection highPressureMultiplier: 0.27 lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #Organic Space Suit - type: entity @@ -498,6 +491,13 @@ sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi - type: PointLight color: "#addbff" + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #ERT Engineer Hardsuit - type: entity @@ -512,6 +512,13 @@ sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi - type: PointLight color: "#f4ffad" + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #ERT Medical Hardsuit - type: entity @@ -540,6 +547,13 @@ sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi - type: PointLight color: "#ffadc6" + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 #ERT Janitor Hardsuit - type: entity @@ -592,10 +606,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.9 - Heat: 0.1 - Shock: 0.1 - Cold: 0.2 - Radiation: 0.2 + Heat: 0.9 #Deathsquad Hardsuit - type: entity @@ -612,6 +623,15 @@ - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.80 + Heat: 0.80 + Radiation: 0.80 + Caustic: 0.95 #MISC. HARDSUITS #Clown Hardsuit @@ -628,9 +648,3 @@ sprite: Clothing/Head/Hardsuits/clown.rsi equipSound: /Audio/Mecha/mechmove03.ogg unequipSound: /Audio/Effects/Emotes/parp1.ogg - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.95 - Piercing: 0.95 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a5301400a2..7bfdf65feb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -1,3 +1,6 @@ +#These are intentionally all very mediocre as locational damage does not exist yet. Without it, armor values will stack in a way that makes it really god damn hard to determine how effective something is, along with making players extremely tanky. +#When it DOES exist, the values here should be totally reworked - probably just port them from SS13. + #Basic Helmet (Security Helmet) - type: entity parent: ClothingHeadBase @@ -9,13 +12,13 @@ sprite: Clothing/Head/Helmets/security.rsi - type: Clothing sprite: Clothing/Head/Helmets/security.rsi - - type: Armor + - type: Armor #Values seem to let the user survive one extra hit if attacked consistently. modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 + Blunt: 0.9 + Slash: 0.9 Piercing: 0.9 - Heat: 0.8 + Heat: 0.9 - type: Tag tags: - WhitelistChameleon @@ -43,14 +46,15 @@ sprite: Clothing/Head/Helmets/swat.rsi - type: Clothing sprite: Clothing/Head/Helmets/swat.rsi - - type: Armor #In SS13 this has 100% acid (caustic) protection, however it would be probably be silly to give this to a helmet without locational damage existing yet. + - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was. modifiers: coefficients: - Blunt: 0.70 - Slash: 0.70 + Blunt: 0.80 + Slash: 0.80 Piercing: 0.80 Heat: 0.80 Radiation: 0.80 + Caustic: 0.95 - type: ExplosionResistance damageCoefficient: 0.75 @@ -82,9 +86,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.70 - Slash: 0.80 - Piercing: 0.85 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.95 #Bombsuit Helmet - type: entity @@ -103,9 +107,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.8 - Piercing: 0.8 + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 #Cult Helmet - type: entity @@ -122,10 +126,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 + Blunt: 0.9 Slash: 0.8 Piercing: 0.9 - Heat: 0.8 + Heat: 0.9 #SCAF Helmet - type: entity @@ -142,8 +146,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 + Blunt: 0.9 + Slash: 0.9 Piercing: 0.8 - type: Tag tags: @@ -224,11 +228,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.90 - Slash: 0.90 + Blunt: 0.95 + Slash: 0.95 Piercing: 0.95 - Heat: 0.65 - Radiation: 1 + Heat: 0.80 - type: IdentityBlocker - type: Tag tags: @@ -253,11 +256,7 @@ - type: Armor modifiers: coefficients: - Blunt: 1 - Slash: 1 - Piercing: 1 Heat: 0.4 - Radiation: 1 - type: PressureProtection highPressureMultiplier: 0.25 lowPressureMultiplier: 1 @@ -278,7 +277,7 @@ sprite: Clothing/Head/Helmets/linghelmet.rsi - type: Clothing sprite: Clothing/Head/Helmets/linghelmet.rsi - - type: Armor + - type: Armor #admeme item so it should be fine being overpowered while helmets are still intentionally kneecapped. modifiers: coefficients: Blunt: 0.5 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index ab227b2c64..06cdb94fa1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -1,7 +1,84 @@ # Numbers for armor here largely taken from /tg/. +# NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day. +#Basic armor vest - type: entity parent: ClothingOuterBase + id: ClothingOuterArmorBasic + name: armor vest + description: A standard Type I armored vest that provides decent protection against most types of damage. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/security.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/security.rsi + - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14. + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest. + Heat: 0.80 + - type: ExplosionResistance + damageCoefficient: 0.90 + +#Alternate / slim basic armor vest +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterArmorBasicSlim + name: armor vest + suffix: slim + description: A slim Type I armored vest that provides decent protection against most types of damage. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/security_slim.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/security_slim.rsi + +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorRiot + name: riot suit + description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/riot.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/riot.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.7 + Heat: 0.9 + Caustic: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: GroupExamine + +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterArmorBulletproof + name: bulletproof vest + description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/bulletproof.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/bulletproof.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.4 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.80 + +- type: entity + parent: ClothingOuterArmorBasic id: ClothingOuterArmorReflective name: reflective vest description: An armored vest with advanced shielding to protect against energy weapons. @@ -18,24 +95,6 @@ Piercing: 0.9 Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature -- type: entity - parent: ClothingOuterBase - id: ClothingOuterArmorBulletproof - name: bulletproof vest - description: An armored vest with heavy plates to protect against ballistic projectiles. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.4 - Heat: 0.9 - - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorCult @@ -120,28 +179,6 @@ - type: Clothing sprite: Clothing/OuterClothing/Armor/magusred.rsi -- type: entity - parent: ClothingOuterBaseLarge - id: ClothingOuterArmorRiot - name: riot suit - description: An armored vest with heavy padding to protect against melee attacks, perfect for fighting delinquents around the station. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Armor/riot.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Armor/riot.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.4 - Slash: 0.4 - Piercing: 0.7 - Heat: 0.9 - Caustic: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - - type: GroupExamine - - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorScaf diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 2a7fe48e82..2466d0a8c3 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -22,13 +22,13 @@ - type: StorageFill contents: - id: SmokingPipeFilledTobacco - - type: Armor + - type: Armor #same as regular sec armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.6 - Heat: 0.9 + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 + Heat: 0.80 - type: entity parent: ClothingOuterStorageBase @@ -45,7 +45,7 @@ parent: ClothingOuterStorageBase id: ClothingOuterCoatHoSTrench name: head of security's armored trenchcoat - description: This trenchcoat was specifically designed for asserting superior authority. + description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. components: - type: Sprite sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi @@ -54,10 +54,13 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.4 - Heat: 0.7 + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 + Heat: 0.70 + Caustic: 0.75 #not the full 90% from ss13 because of the head + - type: ExplosionResistance + damageCoefficient: 0.90 - type: entity parent: ClothingOuterStorageBase @@ -212,10 +215,12 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.4 - Heat: 0.8 + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 + Heat: 0.70 + - type: ExplosionResistance + damageCoefficient: 0.90 - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 8d45fc6f79..315ce91093 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -20,7 +20,7 @@ Piercing: 0.9 Heat: 0.9 Radiation: 0.9 - Caustic: 0.9 + Caustic: 0.85 - type: ExplosionResistance damageCoefficient: 0.9 - type: ClothingSpeedModifier @@ -53,8 +53,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.4 - Radiation: 0.25 - Caustic: 0.85 + Radiation: 0.75 + Caustic: 0.50 - type: TemperatureProtection coefficient: 0.001 - type: ExplosionResistance @@ -83,11 +83,12 @@ modifiers: coefficients: Blunt: 0.9 - Slash: 0.85 - Piercing: 0.85 + Slash: 0.9 + Piercing: 0.95 Heat: 0.7 - Radiation: 0.35 - Caustic: 0.85 + Shock: 0.8 + Caustic: 0.75 + Radiation: 0.25 - type: ExplosionResistance damageCoefficient: 0.2 - type: ToggleableClothing @@ -117,8 +118,8 @@ Slash: 0.9 Piercing: 0.95 Heat: 0.9 - Radiation: 0.5 - Caustic: 0.9 + Radiation: 0.75 #salv is supposed to have radiation hazards in the future + Caustic: 0.85 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSpatio @@ -146,7 +147,7 @@ Slash: 0.7 Piercing: 0.7 Heat: 0.85 - Radiation: 0.5 + Radiation: 0.50 Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.3 @@ -177,7 +178,6 @@ Slash: 0.6 Piercing: 0.6 Heat: 0.8 - Radiation: 0.25 Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.4 @@ -208,7 +208,6 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.9 - Radiation: 0.30 Caustic: 0.2 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic @@ -234,7 +233,7 @@ Slash: 0.6 Piercing: 0.6 Heat: 0.8 - Radiation: 0.25 + Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.4 - type: ToggleableClothing @@ -264,7 +263,7 @@ Slash: 0.8 Piercing: 0.75 Heat: 0.3 - Radiation: 0.1 + Radiation: 0.50 Caustic: 0.6 - type: ExplosionResistance damageCoefficient: 0.5 @@ -296,7 +295,7 @@ Piercing: 0.8 Heat: 0.4 Radiation: 0.0 - Caustic: 0.85 + Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.2 - type: ToggleableClothing @@ -323,7 +322,6 @@ modifiers: coefficients: Heat: 0.90 - Radiation: 0.25 Caustic: 0.1 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMedical @@ -423,7 +421,7 @@ Slash: 0.6 Piercing: 0.5 Heat: 0.4 - Radiation: 0.20 + Radiation: 0.50 Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.5 @@ -454,7 +452,7 @@ Slash: 0.2 Piercing: 0.2 Heat: 0.5 - Radiation: 0.1 + Radiation: 0.25 Caustic: 0.35 - type: ExplosionResistance damageCoefficient: 0.8 @@ -487,7 +485,7 @@ Slash: 0.5 Piercing: 0.4 Heat: 0.2 - Radiation: 0.20 + Radiation: 0.25 Caustic: 0.5 - type: ExplosionResistance damageCoefficient: 0.3 @@ -518,7 +516,7 @@ Slash: 0.4 Piercing: 0.3 Heat: 0.3 - Radiation: 0.20 + Radiation: 0.25 Caustic: 0.4 - type: ExplosionResistance damageCoefficient: 0.5 @@ -549,7 +547,7 @@ Slash: 0.6 Piercing: 0.4 Heat: 0.25 - Radiation: 0.20 + Radiation: 0.25 Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.5 @@ -580,7 +578,6 @@ Slash: 0.95 Piercing: 1 Heat: 0.5 - Radiation: 0.3 - type: ExplosionResistance damageCoefficient: 0.2 - type: ToggleableClothing @@ -609,7 +606,7 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.4 - Radiation: 0.2 + Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.7 - type: ToggleableClothing @@ -639,7 +636,7 @@ Slash: 0.8 Piercing: 0.85 Heat: 0.4 - Radiation: 0.2 + Caustic: 0.75 - type: ExplosionResistance damageCoefficient: 0.6 - type: ToggleableClothing @@ -737,7 +734,7 @@ Slash: 0.2 Piercing: 0.2 Heat: 0.2 - Radiation: 0.2 + Radiation: 0.1 Caustic: 0.2 - type: ExplosionResistance damageCoefficient: 0.2 @@ -800,6 +797,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.9 + Caustic: 0.85 - type: ExplosionResistance damageCoefficient: 0.9 - type: Construction diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index b22a167015..bcc425714a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -1,23 +1,4 @@ -- type: entity - parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo - id: ClothingOuterVestWebMerc - name: merc web vest - description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 #slightly better overall protection but slightly worse than kevlar against bullets seems sensible - Slash: 0.7 - Piercing: 0.5 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - +#Web vest - type: entity parent: ClothingOuterStorageBase id: ClothingOuterVestWeb @@ -38,28 +19,30 @@ - type: ExplosionResistance damageCoefficient: 0.9 +#Mercenary web vest - type: entity - parent: ClothingOuterBase - id: ClothingOuterVestKevlar - name: kevlar vest - description: An armor vest made of synthetic fibers. + parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo + id: ClothingOuterVestWebMerc + name: merc web vest + description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. components: - type: Sprite - sprite: Clothing/OuterClothing/Vests/kevlar.rsi + sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi - type: Clothing - sprite: Clothing/OuterClothing/Vests/kevlar.rsi + sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi - type: Armor modifiers: coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.4 + Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible + Slash: 0.7 + Piercing: 0.5 Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.9 +#Detective's vest - type: entity - parent: ClothingOuterBase + parent: ClothingOuterArmorBasic id: ClothingOuterVestDetective name: detective's vest description: A hard-boiled private investigator's armored vest. @@ -68,16 +51,8 @@ sprite: Clothing/OuterClothing/Vests/detvest.rsi - type: Clothing sprite: Clothing/OuterClothing/Vests/detvest.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.75 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 +#Hazard vest - type: entity parent: ClothingOuterBase id: ClothingOuterVestHazard @@ -89,6 +64,7 @@ - type: Clothing sprite: Clothing/OuterClothing/Vests/hazard.rsi +#(Bartender) vest - type: entity parent: ClothingOuterBase id: ClothingOuterVest diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 184788ddbc..b3640baa77 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -16,7 +16,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 - type: entity parent: ClothingOuterWinterCoat @@ -102,7 +102,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.75 - type: entity @@ -118,7 +118,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.75 - type: entity @@ -154,7 +154,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.9 - type: entity @@ -200,7 +200,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.9 Caustic: 0.9 - type: entity @@ -216,7 +216,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.9 - type: entity @@ -278,7 +278,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.9 - type: entity @@ -304,7 +304,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.9 - type: entity @@ -330,7 +330,7 @@ modifiers: coefficients: Slash: 0.95 - Heat: 0.75 + Heat: 0.90 Caustic: 0.9 - type: entity @@ -342,14 +342,13 @@ - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.6 #slightly less bulletproof than wardens normal coat - Heat: 0.75 + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.8 #slightly less bulletproof then warden's normal coat + Heat: 0.70 - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index de08bbd18c..b64d2c8230 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -23,7 +23,7 @@ equipment: head: ClothingHeadHatTophat jumpsuit: ClothingUniformJumpsuitBartender - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterVest back: ClothingBackpackFilled shoes: ClothingShoesColorBlack id: BartenderPDA diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index 5661905def..7c24415f48 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -19,7 +19,7 @@ head: ClothingHeadHatCentcom eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasic id: CentcomPDA ears: ClothingHeadsetAltCommand pocket1: PaperOffice diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index c1f1d9b0bc..4af43324ca 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -21,7 +21,7 @@ head: ClothingHeadHelmetERTLeader eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCommand belt: ClothingBeltSecurityWebbing @@ -66,7 +66,7 @@ head: ClothingHeadHelmetERTEngineer eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesColorYellow - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCommand belt: ClothingBeltChiefEngineerFilled @@ -111,7 +111,7 @@ head: ClothingHeadHelmetERTSecurity eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCommand belt: ClothingBeltSecurityWebbing @@ -156,7 +156,7 @@ head: ClothingHeadHelmetERTMedic eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCommand belt: ClothingBeltMedicalFilled @@ -202,7 +202,7 @@ shoes: ClothingShoesGaloshes head: ClothingHeadHelmetERTJanitor gloves: ClothingHandsGlovesColorBlack - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCommand belt: ClothingBeltJanitorFilled diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index ca627885c6..2ba3c19b52 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -149,7 +149,7 @@ jumpsuit: ClothingUniformJumpsuitOperative head: ClothingHeadHelmetSwatSyndicate mask: ClothingMaskGas - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasic ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat back: ClothingBackpackFilled @@ -166,7 +166,7 @@ jumpsuit: ClothingUniformJumpsuitOperative head: ClothingHeadHelmetSwatSyndicate mask: ClothingMaskGas - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasic ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat back: ClothingBackpackFilled @@ -185,7 +185,7 @@ jumpsuit: ClothingUniformJumpsuitOperative head: ClothingHeadHelmetSwatSyndicate mask: ClothingMaskGas - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasic ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat back: ClothingBackpackFilled @@ -203,7 +203,7 @@ jumpsuit: ClothingUniformJumpsuitOperative head: ClothingHeadHelmetSwatSyndicate mask: ClothingMaskGas - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasic ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat back: ClothingBackpackFilled @@ -225,7 +225,7 @@ eyes: ClothingEyesGlassesSecurity head: ClothingHeadHelmetSwat mask: ClothingMaskGasSwat - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasicSlim ears: ClothingHeadsetSecurity gloves: ClothingHandsGlovesCombat innerclothingskirt: ClothingUniformJumpskirtSec diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index b234798b6b..4a27e04a24 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -25,6 +25,7 @@ jumpsuit: ClothingUniformJumpsuitColorRed back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsJack + outerClothing: ClothingOuterArmorBasic id: SecurityCadetPDA ears: ClothingHeadsetSecurity innerclothingskirt: ClothingUniformJumpskirtColorRed diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index d6a4c19f61..572e8df552 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -26,7 +26,7 @@ shoes: ClothingShoesBootsJack eyes: ClothingEyesGlassesSecurity head: ClothingHeadHelmetBasic - outerClothing: ClothingOuterVestKevlar + outerClothing: ClothingOuterArmorBasic id: SecurityPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png index de03585e44682976fdd4094a853ccf95bd1282ae..c9e4989cd56731067e1cc1049bbc6cfb03b6610a 100644 GIT binary patch delta 543 zcmaFQww7grWIZzj1H;_yjcNS%G}x0G|-o zyu7^7&`>uwH+gyajEoFTO-(H=t^EuPo}Qln8TegYU7Z{q{r&yDyu9q}>`Y8dfciw7 z7Ayf$f+azI!T-?!gX-G)nMpud&H|6fVg?4j!ywFfJby(B&^2kEE{-7)?r*2vp46S2880*?+QUeL6{)iKFmo3xjja&z1(K zn4KXXRwVHnZ>(?K=*}sp7Bi!kSy`xtQ8BA|T|x|R+LuIbW&Zp1&3oE6x^w#o9P!GU zA;|FIgV-<8hMdNTbKwjYzQTuYa;5CO(|E@@v0^ck+#be63!yLH8Xk0Z_-o8tvZzVx zn!&{u;foLD&MdC^nNj!5U|r%*Mb=I(-50i}c4r*a%sZ%CaHq+eHGk!|X;X9eJNun$ z+LT>>;-olNSN$$I%b#A23H66dg|_xD?}gh6~3CvujnbzFTVC`X3$*6O$#bNt6Bwe`xSEMH9o#9(Ukg= Z)ko@!#Zuzc)I$ztaD0e0svpF;Zpzr delta 867 zcmV-p1DyP=1n&lr8Gi-<0063Kaozv`12#!SK~#90?V3A|;y@6F+p7%_2@ygB2ojKZ z#H4JrH`u)c3EXD60~tqvkQg%pG$Rm52oaHx%t~JU7KMx#x4VsBF!f26$L{uY)!$FL zS}+X5cwt%A(_Fn?&+@WW#v|N4mqfc;G3=%OtE6o;dxXFdB`-dcD?~ z1+-U!_neo#4--sx)9F;ae|%iW0NnA6_cR^qpd|pNx<}H(05uFpce|ZE=;4lM-I^z~ zx&ZaTpy`i7gPYeNr@IIO(hvN0Q=SD(lV0$z!4%k#C@eqsq58$>H_Q^Iy zr7eICB_Ql{I2`PMcs`$R_TY76abY{}EE|y{*nbES3Wb8mWHKa>r+vy@;GXm160Sxe zwOY+HY!)U6!65*%TrRJtLkQSLB0vBYlmkHTVb;bz5<{?oCJ}z0Mtqx&O2?AwKmuan;*8xeeS+q tuX~=!Ps?@BMuuS+hG7_nVQvvZ`~z~Rz=~edVTb?#002ovPDHLkV1flCmIMF* diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json index fce8c90ce8..aa3381b0eb 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/security.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/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..fb4087b662b9e233ad0108c8419361b5871021a9 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}z>gyRgIl3q+D1`(Eq@^ZGh)XIfshOKu0Ohr8L@od+&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!V$jK}j=qyQ~r^>lFziEw{A?JnP81rE21WozI6Kl0llJ7Lkw zy1Z!xmrR8|gp@Of>{DS;OsLadaq!N}E58qgsP~-^%Lr0jG_@h&!F`@ZQ-nmMgj1IU zpVF0bl)JG=%v&suJ2^c7HFbX%tbN4l$+cu}@QsI`R3s^VBm6QjxwQPwe zEH4+*EXT5a-2-mD!!-^&in8_#hKLC_O`j$AT@Ps6=kHBH^DaKDVqj48*b59L22WQ% Jmvv4FO#l>nqagqQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b15dd82f3963c97d0c61ca6c2b1c257f997f75 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STCB!B5^$eXHUD8q$LxKZ}%WV&VUGLLlE!1rC;S#`pD4w{yu~vbn@vvdC~YU&qm^ zhr*NE8Emwp)Xwm%nR16o*5uIai!7nRv1yHrN)}wR6a;21`t*=X>cE>fVWG<}Fs!=v zJ&>ckw4mSfhVB=(ZSzaHe|PO&roHXpW^MT@4=q*Ozd!@U6W7YGeJAAjneY2Opeqk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y>gyRgIl3q+D1`(Eq@^ZGh)V)xN*DC?0V(#9Aiv=MV89^d&Flsg z;wn1+9PFHofN&T%!GKeGcantGDJS44dCPS<*Ho_v#6bn|F-4 zH!W$oC~cy4XtP37(TWEe%?=w|+c`d1`ySx@u7w(1hH{>ta`;S1+$mIR4vcC8JZ%(YFo)thYp#Ra_PoKzUowN&+{DA0=xp00i_ I>zopr0DZ!X1^@s6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0c32567bd33f5cce9a6720224732cfd24544e56f GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y>gyRgIl3q+D1`(Eq@^ZGh)V)xN*DC?0V(#9Aiv=MV89^d&Flsg z;wgEi2 z$z8{|#y+S?h(lGQ@xzn_?LEAvujanx_*T@`oWMQf<$)|yA#TBy@=i-`WbJNX2%P81 z%utgRdO=J~CpW0!jN<{_4wH+GSMU95EoRSQsQjhaV%;$Psg&mhni1V~^jB&p>i#JoEw8S2T2%(BaY)wDJ z*RejFWDvtp<~Q^A{r9KKePx=L75&+p5PQGyZA_QSdR0ZB=NLR){an^LB{Ts5@Scai literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json similarity index 85% rename from Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/meta.json rename to Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json index e482264df5..e0d437b8ec 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/oldarmor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index f660671c4ca0028f70644ba2ed4a5e6200b0c4c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~%wtaSW-L^LCbhzLdMfvH5qO z_D6JF2+3aKaW{;uF~+4MN1coVMoJs+ENsS|yFy%Bmc8vu;)~Zu#nQ_MhKro>|{-rl-eEn;E|Q$5)nkqg`2y zt2lWBbRA3=GOl7>p=RQ+mEmd&+X}G-Qku+fvKnt+Wt#prTEy|l^m&Xe0#mZ5b~-$b zY87@$X`j^{qSZRvJS&{rW~$d&(>NEi3ahzptFIm^-(O>|cxaQ(m*0PPx|}(@C~fu> zMg|8>Rz;S!#08gM9x(BhXk+wxsr02r==7$vZSiq&Uj63fLNa{q2ELbf@8bobiRG?@7b4jto z?z?Wg?|z$Sm3$_fdsg0d?u0E*jy>M(ed+CV#~TgJ$Jd*BX(~?<`?fGaYANswu)bo5pj9z=v#*S+@Z@SENxNubPanEtB>sotC%i4gV zF?#B@(>5>yF_5+ye1a4+pOynW?x+Xv{?%tD_oi=-lxS-N zs)(|i-=2Frm{msJIg4}7{Q1e7gDx{XcXfB(hTU)6ryx2sy(J3p+RE0KBHv}wz3^{x6Hwf#0w2hW#~8~tzJ<{BKU5uP{y zS|o>bK~TN5yaDM5|^4)$o1w!|NLj5BAc zCNjVJy6b)Z-es8)adBdNJ2W=k)G^8ZReOA$SjFBraXI%J4dwo2Ci{O$m$UJ(F+W@| zzgzlr{x?-2&OOzegzwBwczCn6?(?pjIZ9&P2Mc9xK3q~L!@eo2+PAT%LsqqjDxqdoNW%DhRQiK{e89S089djFfJF*}r>mdK II;Vst05y*qwEzGB diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png deleted file mode 100644 index 0fdb5b94d06add24da965bc7c5bae173923b929d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmV-W0k8gvP)+8no&cJ6Kf0M0pfr~S-mciKvDOmDF(RTihd+dH97n9Re!NzT0j>cX z$ML3H5%Cb(ATGXwEXx4s`yRk||GNf|rm4nXmjP?-?C7s@&LJW`7aFNE&@>HA)A+9Y zzW22?S`2VGoFfq-NfL}P-Wv&($=I?)Uqs{OxvAmSs;h00000000000D%ALu`{sUZsTsZ zOZWHmukzkMJ@{iGW2|KR0jaH4D;*App?1zq>hrP#I3ADc`+lgG%jKj#FFOE9n$14f y8}|GCq#iFjfIQEK&6D+d9Z#oI_Co{!@ZCGUtWx!6^>Tgy0000plx2dWc$Ov_kGHj+B*tX?aDmOqv7Li-2A0Btn=if(+_u83jvJ)fj!pm_nP`9 zPr72#TlxO&eq-B1)%EB9)Y?8PezUmP@0?|>nRN8pFsU}j-+%4G?rE&cH}JHQ>!1AH zZW*5w$EnXT?S~be_UxEbtaUo5d0)u1rE`iWm%CdloG(s|EQ?>BDW#sNlD2H$`=^^0 z?DJ1G`^(-hrqHrr-Rmt8I#){Po_k)rWrN`yKXp~lPs#ic2LZ_kg|2}Sx3_(lY}y`t zeXD2C?QLP#zrJD9h|Ag=cYc?!8oNr}VvVkwc7L9&WV#boxBa$iXy{(Ei}Ka07*0P8 mniLW`HFx{%o4f%G4D0k_Rt2Aa@vx~FWVolRpUXO@geCxhq?FJA diff --git a/Resources/migration.yml b/Resources/migration.yml index 41fdbf8b7e..d643ff1f74 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -97,4 +97,8 @@ WindoorParamedicLocked: WindoorSecureParamedicLocked # 2023-07-03 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic -ClothingHeadHelmetHelmetOld: ClothingHeadHelmetBasic \ No newline at end of file +ClothingHeadHelmetHelmetOld: ClothingHeadHelmetBasic + +# 2023-07-04 +# Bulletproof armor is almost statistically identical to kevlar, however, before this kevlar armor was the closest thing there was to "basic" armor. It makes the most sense to replace it with this. +ClothingOuterVestKevlar: ClothingOuterArmorBasic \ No newline at end of file