]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
PARTY HATS YIPPIE (#22850)
authorlzk <124214523+lzk228@users.noreply.github.com>
Fri, 22 Dec 2023 07:25:20 +0000 (08:25 +0100)
committerGitHub <noreply@github.com>
Fri, 22 Dec 2023 07:25:20 +0000 (00:25 -0700)
* :party:

* a little trolling

18 files changed:
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET-hamster.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_blue.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_blue.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET-hamster.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_green.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_green.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET-hamster.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_red.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_red.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET-hamster.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/meta.json [new file with mode: 0644]

index 67e9fff64051a5fbe1faddc5078c77ae0f56f88b..54e518ba90d102b8a6a91dfea812889f94ea53a9 100644 (file)
       - id: DrinkLean
         amount: 4
       - id: KnifePlastic
+      - id: ClothingHeadHatPartyRed
+        amount: 2
+      - id: ClothingHeadHatPartyYellow
+        amount: 2
+      - id: ClothingHeadHatPartyGreen
+        amount: 2
+      - id: ClothingHeadHatPartyBlue
+        amount: 2
 
 - type: entity
   id: CrateFunWaterGuns
index 12deec76e9593b1c4125b3ad85b17ea50c30ac76..6ebd2d94c53621f939b91e0f8de02dd4bd37cde0 100644 (file)
     sprite: Clothing/Head/Hats/gladiator.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/gladiator.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatPartyRed
+  name: red party hat
+  description: Spread a joy!
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/party_red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/party_red.rsi
+
+- type: entity
+  parent: ClothingHeadHatPartyRed
+  id: ClothingHeadHatPartyYellow
+  name: yellow party hat
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/party_yellow.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/party_yellow.rsi
+
+- type: entity
+  parent: ClothingHeadHatPartyRed
+  id: ClothingHeadHatPartyGreen
+  name: green party hat
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/party_green.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/party_green.rsi
+
+- type: entity
+  parent: ClothingHeadHatPartyRed
+  id: ClothingHeadHatPartyBlue
+  name: blue party hat
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/party_blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/party_blue.rsi
diff --git a/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET-hamster.png
new file mode 100644 (file)
index 0000000..7349b6d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..14ec91e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/icon.png
new file mode 100644 (file)
index 0000000..13aec62
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/party_blue.rsi/meta.json
new file mode 100644 (file)
index 0000000..b63910b
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by netwy(583844759429316618)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET-hamster.png
new file mode 100644 (file)
index 0000000..18360c5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..e4eca43
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_green.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/icon.png
new file mode 100644 (file)
index 0000000..33a0d60
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_green.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/party_green.rsi/meta.json
new file mode 100644 (file)
index 0000000..b63910b
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by netwy(583844759429316618)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET-hamster.png
new file mode 100644 (file)
index 0000000..bbd542d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..d957d7b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/icon.png
new file mode 100644 (file)
index 0000000..c3eb894
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/party_red.rsi/meta.json
new file mode 100644 (file)
index 0000000..b63910b
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by netwy(583844759429316618)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET-hamster.png
new file mode 100644 (file)
index 0000000..9adc4fc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..684c82c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/icon.png
new file mode 100644 (file)
index 0000000..8cfa34f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/party_yellow.rsi/meta.json
new file mode 100644 (file)
index 0000000..b63910b
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by netwy(583844759429316618)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}