]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adding a holy watermelon helmet (#32272)
authorravage <142820619+ravage123321@users.noreply.github.com>
Sun, 22 Sep 2024 10:33:08 +0000 (13:33 +0300)
committerGitHub <noreply@github.com>
Sun, 22 Sep 2024 10:33:08 +0000 (12:33 +0200)
* lolkekhatholy

alalalla

* animationcreate

blelebleblbeleb

Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json [new file with mode: 0644]

index 123896240d9debbfca4b6b298ee9b92100fd8b49..97145a0f00d8ca3c88d31848c3d578f7ce4b7c6c 100644 (file)
       coefficients:
         Blunt: 0.95
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHolyWatermelon
+  name: watermelon halo
+  description: Holy moly.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/holyhatmelon.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/holyhatmelon.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.95
+
 - type: entity
   parent: [ClothingHeadBase, BaseSyndicateContraband]
   id: ClothingHeadHatSyndie
index fa88f30074ea51262a9339ba78f7cf73c04d65f6..342f2723b8d8ce75d0447b367a71f6cadfb0f505 100644 (file)
   - type: SliceableFood
     count: 5
     slice: FoodHolymelonSlice
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: ClothingHeadHatHolyWatermelon
   - type: Tag
     tags:
     - Fruit
diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..bfd047d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png
new file mode 100644 (file)
index 0000000..6161c05
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..6f8c72d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6a4eb8b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json
new file mode 100644 (file)
index 0000000..302f437
--- /dev/null
@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by ravage",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+        "name": "equipped-HELMET",
+        "directions": 4,
+        "delays": [
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ],
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ],
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ],
+          [
+            0.5,
+            0.5,
+            0.5,
+            0.5
+          ]
+        ]
+      },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}