Paper cups as party hats (#24334)

* Water cups wearable as party hats

* Removed extra commented lines

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index eac7a80edc9da14d33eb8ae93371f9f7414e4f74..51238662536a174c3e5878c8498fe0ff5068beb2 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -868,6 +868,17 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/party_blue.rsi
 
+- type: entity
+  parent: ClothingHeadHatPartyRed
+  id: ClothingHeadHatPartyWaterCup
+  name: water cup party hat
+  description: Not as fulfilling as you had hoped...
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/party_water_cup.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/party_water_cup.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatGreyFlatcap

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index d4b44fe4f810514638b5c27c219f5ad5773c6cd8..a1748700f9f69955a106886655de80b551d90fc9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -330,5 +330,11 @@
   - type: Tag
     tags:
     - Trash
+    - DroneUsable
+    - WhitelistChameleon
   - type: TrashOnSolutionEmpty
     solution: drink
+  - type: Clothing
+    slots:
+    - HEAD
+    sprite: Clothing/Head/Hats/party_water_cup.rsi

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET-hamster.png
new file mode 100644 (file)
index 0000000..e853ca5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET-hamster.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..dc7b38d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/icon.png
new file mode 100644 (file)
index 0000000..c723dc0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json
new file mode 100644 (file)
index 0000000..e51d9a2
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/party_water_cup.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Krunklehorn (GitHub), shape by netwy(583844759429316618), colors from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}