]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
salvager maxim suit (#23734)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Mon, 8 Jan 2024 12:55:40 +0000 (05:55 -0700)
committerGitHub <noreply@github.com>
Mon, 8 Jan 2024 12:55:40 +0000 (23:55 +1100)
* salvager maxim suit

* why unversioned

12 files changed:
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json [new file with mode: 0644]

index deade89995615f3f49ce791aa30ea24a7fbb9c3f..f42b3a9405f6b7e8a465c22c094e0aed91f08387 100644 (file)
     radius: 7
     energy: 3
 
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitMaxim
+  noSpawn: true
+  name: salvager maxim helmet
+  description: A predication of decay washes over your mind.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/maxim.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/maxim.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+
 #Security Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   - type: PointLight
     color: "#f4ffad"
     radius: 5
-    energy: 2  
\ No newline at end of file
+    energy: 2
index f88ad818ac743ceff21400518aa0e87b65d67c11..a2242efed7fe1079e26ccd713abfbb075f265517 100644 (file)
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSalvage
 
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitMaxim
+  name: salvager maxim hardsuit
+  description: Fire. Heat. These things forge great weapons, they also forge great salvagers.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/maxim.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/maxim.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.02
+    lowPressureMultiplier: 1000
+  - type: ClothingSpeedModifier
+    walkModifier: 1.0
+    sprintModifier: 1.0
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.5
+        Heat: 0.3
+        Radiation: 0.1
+  - type: ExplosionResistance
+    damageCoefficient: 0.2
+  - type: TemperatureProtection
+    coefficient: 0.001
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitMaxim
+
 #Security Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitBase
     sprintModifier: 0.9
   - type: HeldSpeedModifier
   - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitSanta
\ No newline at end of file
+    clothingPrototype: ClothingHeadHelmetHardsuitSanta
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..e501c15
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png
new file mode 100644 (file)
index 0000000..b694871
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..81e8a07
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..e10648f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json
new file mode 100644 (file)
index 0000000..2d5aaae
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..b4c0509
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png
new file mode 100644 (file)
index 0000000..b4b447a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..8c4a7e0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..c6f785c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json
new file mode 100644 (file)
index 0000000..3641da6
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file