diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index de4c6a150725..be761ba837bd 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -367,6 +367,14 @@ armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25) attachment_slot = GROIN +///////////// +//Poppy Pin// +///////////// +/obj/item/clothing/accessory/poppypin + name = "Poppy pins" + desc = "A poppy pin that is meant to commemorate the fallen soldiers in wars. It symbolizes the gunshot that killed the soldiers." + icon_state = "poppy" + item_color = "poppy" ////////////// //Ooh shiny!// ////////////// diff --git a/icons/mob/accessories.dmi b/icons/mob/accessories.dmi index a3d93d7c3cbb..83790d523ffb 100644 Binary files a/icons/mob/accessories.dmi and b/icons/mob/accessories.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 86623b400167..e2e073790e43 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/yogstation/code/modules/crafting/recipes.dm b/yogstation/code/modules/crafting/recipes.dm index 4b6b30e2e070..1c07dc282fb3 100644 --- a/yogstation/code/modules/crafting/recipes.dm +++ b/yogstation/code/modules/crafting/recipes.dm @@ -87,3 +87,22 @@ /obj/item/stack/sheet/mineral/mythril = 1, /obj/item/clothing/gloves/bracer = 1) category = CAT_PRIMAL + +/datum/crafting_recipe/poppy + name = "poppy pin" + result = /obj/item/clothing/accessory/poppypin + time = 2 SECONDS + reqs = list ( + /obj/item/reagent_containers/food/snacks/grown/poppy = 1, + /obj/item/reagent_containers/syringe = 1 + ) + category = CAT_MISC + +/datum/crafting_recipe/poppy2 + name = "poppy pin" + result = /obj/item/clothing/accessory/poppypin + time = 2 SECONDS + reqs = list ( + /obj/item/reagent_containers/food/snacks/grown/poppy = 1, + /obj/item/stack/rods = 1 + ) \ No newline at end of file