From 8fa87eceb990a410ff2ee44f923cad6721c3fe74 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:52:44 +0200 Subject: [PATCH 1/2] plastic flowers --- code/modules/client/loadout/loadout_hat.dm | 4 ++++ code/modules/clothing/head/misc_special.dm | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/code/modules/client/loadout/loadout_hat.dm b/code/modules/client/loadout/loadout_hat.dm index d4ab1c858f26..3d2905720f0a 100644 --- a/code/modules/client/loadout/loadout_hat.dm +++ b/code/modules/client/loadout/loadout_hat.dm @@ -121,3 +121,7 @@ /datum/gear/hat/trapper display_name = "trapper hat" path = /obj/item/clothing/head/trapper + +/datum/gear/hat/flowers + display_name = "plastic flower, pickable" + path = /obj/item/clothing/head/plastic_flower diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index c04b61563f53..8243b83178a4 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -367,3 +367,19 @@ if(!warped) warp_up() +/obj/item/clothing/head/plastic_flower + name = "plastic flower" + desc = "A realistic imitation of a flower. Not edible though." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "poppy" + unique_reskin = list( + "Poppy" = "poppy", + "Sunflower" = "sunflower", + "Moonflower" = "moonflower", + "Novaflower" = "novaflower", + "Harebell" = "harebell", + "Geranium" = "geranium", + "Lily" = "lily" + ) + custom_materials = (list(/datum/material/plastic = 1000)) + From 2b41d7360418211c88c8f06e1a27fa0bae91f44e Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:01:13 +0200 Subject: [PATCH 2/2] coverage --- code/modules/clothing/head/misc_special.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 8243b83178a4..24e2f95f03bd 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -372,6 +372,7 @@ desc = "A realistic imitation of a flower. Not edible though." icon = 'icons/obj/hydroponics/harvest.dmi' icon_state = "poppy" + body_parts_covered = null unique_reskin = list( "Poppy" = "poppy", "Sunflower" = "sunflower",