From: Minemoder5000 Date: Tue, 15 Apr 2025 21:39:18 +0000 (-0600) Subject: Remove elite and juggernaut hardsuits from traitor uplink, add elite webvest (#36225) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=28e3660e376a983fc504628c209dcdfb471d51d2;p=space-station-14.git Remove elite and juggernaut hardsuits from traitor uplink, add elite webvest (#36225) --- diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 1d66bf3a8b..145279b1b5 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -321,6 +321,9 @@ uplink-clothing-thieving-gloves-desc = Discreetly steal from pockets and improve uplink-clothing-outer-vest-web-name = Web Vest uplink-clothing-outer-vest-web-desc = A synthetic armor vest. This one has added webbing and ballistic plates. +uplink-clothing-outer-vest-web-elite-name = Elite Web Vest +uplink-clothing-outer-vest-web-elite-desc = A synthetic armor vest. This one has added webbing and heat resistant fibers. + uplink-clothing-shoes-boots-mag-syndie-name = Blood-red Magboots uplink-clothing-shoes-boots-mag-syndie-desc = A pair of boots that prevent slipping and, in zero gravity, allow you to move normally, at the cost of a slight slowdown. Additionally, they have jetpack functionality and come fueled, but don't last for long. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 77ce1b3b01..91cf7f1483 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1564,6 +1564,19 @@ categories: - UplinkWearables +- type: listing + id: UplinkClothingOuterVestWebElite + name: uplink-clothing-outer-vest-web-elite-name + description: uplink-clothing-outer-vest-web-elite-desc + productEntity: ClothingOuterVestWebElite + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 5 + categories: + - UplinkWearables + - type: listing id: UplinkClothingShoesBootsMagSyndie name: uplink-clothing-shoes-boots-mag-syndie-name @@ -1641,13 +1654,15 @@ description: uplink-hardsuit-syndieelite-desc icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 7 cost: Telecrystal: 12 categories: - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink - type: listing id: UplinkClothingOuterHardsuitJuggernaut @@ -1655,13 +1670,15 @@ description: uplink-clothing-outer-hardsuit-juggernaut-desc icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon } productEntity: CrateCybersunJuggernautBundle - discountCategory: veryRareDiscounts - discountDownTo: - Telecrystal: 8 cost: Telecrystal: 12 categories: - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink - type: listing id: UplinkClothingEyesHudSyndicate diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 42de6bfd02..06bdb73a7c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -19,6 +19,34 @@ - type: ExplosionResistance damageCoefficient: 0.9 +#Elite web vest +- type: entity + parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] + id: ClothingOuterVestWebElite + name: elite web vest + description: A synthetic armor vest. This one has added webbing and heat resistant fibers. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Vests/elitevest.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Vests/elitevest.rsi + - type: TemperatureProtection + heatingCoefficient: 0.1 + coolingCoefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.7 + Heat: 0.3 + Radiation: 0.5 + Caustic: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: FireProtection + reduction: 0.85 + #Mercenary web vest - type: entity parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..c075eb9a7b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..350f6a288b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png new file mode 100644 index 0000000000..65c104d1c7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png new file mode 100644 index 0000000000..520d5c6340 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png new file mode 100644 index 0000000000..e2842ac274 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/meta.json new file mode 100644 index 0000000000..84009efde3 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Vests/elitevest.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14. Minor edits by SlamBamActionman and Minemoder for elite variant.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}