Remake hairflowers (#25475)

* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 960a8f8797e29528618a443a35269f15a34d7c11..5e3c7d94010f6d92ff027fcadb8f471f47d49b71 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -43,7 +43,7 @@
     ClothingMaskScaredMime: 1
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
-    ClothingHeadHatHairflower: 1
+    FoodPoppy: 1
     ClothingHeadHatGladiator: 1
     ClothingUniformJumpsuitGladiator: 1
     ClothingHeadHatCowboyBrown: 1

diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 3fd55faf26618766246109ff39ee434189b62dfd..1149224fc3eaed325fac853e97c79cf228f23643 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -47,20 +47,6 @@
     graph: flowercrown
     node: flowercrown
 
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatHairflower
-  name: hairflower
-  description: A red flower for beautiful ladies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Misc/hairflower.rsi
-  - type: Construction
-    graph: hairflower
-    node: hairflower
-
 - type: entity
   parent: ClothingHeadLightBase
   id: ClothingHeadHatPumpkin

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 21eb0fb9423184e5207276dc7db7170c97a552b2..3f0277e1bc37d24fbfb5f7b9529ec1d82663db7c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1220,6 +1220,10 @@
   id: FoodPoppy
   description: A flower with extracts often used in the production of medicine
   components:
+  - type: Clothing
+    slots:
+    - HEAD
+    quickEquip: false
   - type: FlavorProfile
     flavors:
       - medicine

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 8fdc4793513c1688f01a27869b1427580c2d0788..a417fdf07693af82870756fc5cb5e4fbbbb10438 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -294,7 +294,7 @@
         orGroup: GiftPool
       - id: ClothingHeadHatFlowerCrown
         orGroup: GiftPool
-      - id: ClothingHeadHatHairflower
+      - id: FoodPoppy
         orGroup: GiftPool
       - id: ClothingMaskClown
         orGroup: GiftPool

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml
deleted file mode 100644 (file)
index 76bc124..0000000
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/hairflower.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: constructionGraph
-  id: hairflower
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: hairflower
-          steps:
-            - tag: Flower # TODO change to "RedFlower" or "Poppy" tag, so you cant make red flower from bluesyellow etc., when it will be
-              name: flower
-              icon:
-                sprite: Objects/Specific/Hydroponics/poppy.rsi
-                state: produce
-              doAfter: 3.5
-    - node: hairflower
-      entity: ClothingHeadHatHairflower

diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index 74148375922f7614e5df33becdcca71db9df4150..2c55e4fc2624890eac56a1dc2a33e2b9d0bdc538 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -98,19 +98,6 @@
     sprite: Clothing/Eyes/Misc/blindfold.rsi
     state: icon
 
-- type: construction
-  name: hairflower
-  id: hairflower
-  graph: hairflower
-  startNode: start
-  targetNode: hairflower
-  category: construction-category-clothing
-  description: "A red flower for beautiful ladies."
-  icon:
-    sprite: Clothing/Head/Misc/hairflower.rsi
-    state: icon
-  objectType: Item
-
 - type: construction
   name: flower crown
   id: flowercrown

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png
deleted file mode 100644 (file)
index a87d067..0000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png
deleted file mode 100644 (file)
index f838e54..0000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-left.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png
deleted file mode 100644 (file)
index d56cbfd..0000000
Binary files a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/inhand-right.png and /dev/null differ

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
deleted file mode 100644 (file)
index a470e00..0000000
--- a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..374a798
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
index ddbda4f0afc086527cd65255dd9ecaa166c7c6bc..782dc2bfda0fabb3a5b3d19fab4016770f4af1a5 100644 (file)
--- a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed hue",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,10 @@
     },
     {
       "name": "stage-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png
rename to Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/equipped-HELMET.png

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
index 8b6952d030b9447a573bb199753f8dbe26bd69a2..b49b49cc850cd916693bbc9e99f137208b5fc66a 100644 (file)
--- a/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,10 @@
     },
     {
       "name": "stage-3"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 147e322fb5e2634bfd78913f573ccd02df4f527e..8c0fe2064f450362d006ae1387b79bd3246b2acb 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -237,7 +237,7 @@ AirlockExternalGlassEasyPryLocked: AirlockExternalGlassLocked
 AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked
 AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked
 
-#2024-03-10
+# 2024-03-10
 ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective
 ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective
 ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective
@@ -247,10 +247,13 @@ ImprovisedExplosive: FireBomb
 ImprovisedExplosiveEmpty: FireBombEmpty
 ImprovisedExplosiveFuel: FireBombFuel
 
+# 2024-03-16
+ClothingHeadHatHairflower: FoodPoppy
+
 # 2024-03-21
 RPED: null
 
 # 2024-03-30
 # These are technically not equivalent, but it probably makes more sense to replace any existing SCAF stuff with SOME kind of armor, instead of just deleting it outright.
 ClothingHeadHelmetScaf: ClothingHeadHelmetBasic
-ClothingOuterArmorScaf: ClothingOuterArmorBasic
\ No newline at end of file
+ClothingOuterArmorScaf: ClothingOuterArmorBasic