From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 19 Jul 2024 09:38:26 +0000 (-0500) Subject: Add the Syndicate Raid Suit (#29845) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=93dc22b67da22267c4e60600ea68a6b5deae6b0c;p=space-station-14.git Add the Syndicate Raid Suit (#29845) * Syndicate Raid Suit * Raid suit speed and whitelist * Fix copyright for the syndicate raid helmet --- diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 2598970cef..8edbde9bdc 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -318,6 +318,9 @@ uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully space uplink-hardsuit-syndie-name = Syndicate Hardsuit uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. +uplink-syndie-raid-name = Syndicate Raid Suit +uplink-syndie-raid-desc = A very durable and reasonably flexible suit of blood-red armor, reinforced against all common forms of damage but not capable of space walks. Comes with a sick helmet. + uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index ae57ea6342..71d3f00df3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -247,6 +247,19 @@ - id: DoubleEmergencyOxygenTankFilled - id: DoubleEmergencyNitrogenTankFilled +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateRaidBundle + name: syndicate raid suit bundle + description: "Contains the Syndicate's durable raid armor suit." + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorRaid + - id: ClothingHeadHelmetRaid + - id: ClothingMaskGasSyndicate + - id: ClothingHandsGlovesCombat + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateHardsuitBundle diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c9dc048cd3..420982dcae 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1298,6 +1298,22 @@ categories: - UplinkWearables +- type: listing + id: UplinkClothingOuterArmorRaid + name: uplink-syndie-raid-name + description: uplink-syndie-raid-desc + icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateRaidBundle + cost: + Telecrystal: 8 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: UplinkHardsuitSyndieElite name: uplink-hardsuit-syndieelite-name diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a01d6fae51..b44508d4a3 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -357,6 +357,24 @@ - type: Clothing sprite: Clothing/Head/Helmets/ert_janitor.rsi +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetRaid + name: syndicate raid helmet + description: An armored helmet for use with the syndicate raid suit. Very stylish. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/syndie-raid.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/syndie-raid.rsi + - type: Armor + modifiers: #There's gotta be SOME reason to use this over other helmets. + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + #Bone Helmet - type: entity parent: ClothingHeadHelmetBasic diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 606af0b127..6de0c78220 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -99,6 +99,78 @@ reflects: - Energy +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: ClothingOuterArmorRaid + name: syndicate raid suit + description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect it's wearer from space. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + layers: + - state: icon + - state: light-overlay + visible: false + shader: unshaded + - type: Clothing + sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.35 + Slash: 0.35 + Piercing: 0.35 + Heat: 0.35 + Caustic: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.35 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + #Shoulder mounted flashlight + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING-light + shader: unshaded + - type: Appearance + - type: HandheldLight + addPrefix: false + blinkingBehaviourId: blinking + radiatingBehaviourId: radiating + - type: PointLight + enabled: false + color: "#80ff80" + radius: 5 + energy: 2 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false + - type: LightBehaviour + behaviours: + - !type:FadeBehaviour + id: radiating + interpolate: Linear + maxDuration: 2.0 + startValue: 3.0 + endValue: 2.0 + isLooped: true + reverseWhenFinished: true + - !type:PulseBehaviour + id: blinking + interpolate: Nearest + maxDuration: 1.0 + minValue: 0.1 + maxValue: 2.0 + isLooped: true + - type: Battery + maxCharge: 600 + startingCharge: 600 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 2 + - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorCult diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..c7ab17e261 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..d13b5d9acb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png new file mode 100644 index 0000000000..7baca16fb4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000..e8db961b77 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png new file mode 100644 index 0000000000..1580937e76 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json new file mode 100644 index 0000000000..2faf18830d --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png new file mode 100644 index 0000000000..6833f25027 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png new file mode 100644 index 0000000000..58ba92e53f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..1ab6e6cfef Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..e6a0733e3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png new file mode 100644 index 0000000000..54665d7a0e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000..64d25308ab Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png new file mode 100644 index 0000000000..fd3c44d4ad Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png new file mode 100644 index 0000000000..c98170b7e1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json new file mode 100644 index 0000000000..ff590848da --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}