]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add the Syndicate Raid Suit (#29845)
authorAlzore <140123969+Blackern5000@users.noreply.github.com>
Fri, 19 Jul 2024 09:38:26 +0000 (04:38 -0500)
committerGitHub <noreply@github.com>
Fri, 19 Jul 2024 09:38:26 +0000 (12:38 +0300)
* Syndicate Raid Suit

* Raid suit speed and whitelist

* Fix copyright for the syndicate raid helmet

20 files changed:
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json [new file with mode: 0644]

index 2598970cefbe80631ae13fe3eb97672a61891862..8edbde9bdc9d7da7015543a01410ef204521ca1c 100644 (file)
@@ -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.
 
index ae57ea63421369b670f5b3df1d179359b4b87e6e..71d3f00df35d775925d8f25979e6ff37c1a8c7b5 100644 (file)
       - 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
index c9dc048cd3817ac93be510671eafec7d4d3c3d60..420982dcaecdea07de031b34d8e86675d2ea2ab8 100644 (file)
   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
index a01d6fae51914628edbe445d36722384503ce9d9..b44508d4a37b5fe9d970af794ffa0d9336e2433b 100644 (file)
   - 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
index 606af0b127abfaad6cd0618689ec5225aecc7083..6de0c78220fd37bd30c347ebc1288f4048ecb872 100644 (file)
     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 (file)
index 0000000..c7ab17e
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 (file)
index 0000000..d13b5d9
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 (file)
index 0000000..7baca16
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 (file)
index 0000000..e8db961
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 (file)
index 0000000..1580937
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 (file)
index 0000000..2faf188
--- /dev/null
@@ -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 (file)
index 0000000..6833f25
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 (file)
index 0000000..58ba92e
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 (file)
index 0000000..1ab6e6c
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 (file)
index 0000000..e6a0733
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 (file)
index 0000000..54665d7
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 (file)
index 0000000..64d2530
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 (file)
index 0000000..fd3c44d
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 (file)
index 0000000..c98170b
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 (file)
index 0000000..ff59084
--- /dev/null
@@ -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
+    }
+  ]
+}