diff --git a/code/__DEFINES/crafting.dm b/code/__DEFINES/crafting.dm index 7bfd2935280..0fbd76b9e21 100644 --- a/code/__DEFINES/crafting.dm +++ b/code/__DEFINES/crafting.dm @@ -6,6 +6,10 @@ #define CAT_ROBOT "Robots" #define CAT_MISC "Misc" #define CAT_PRIMAL "Tribal" +#define CAT_DECORATIONS "Decorations" +#define CAT_DECORATION "Decorations" +#define CAT_HOLIDAY "Holiday" +#define CAT_LARGE_DECORATIONS "Large Decorations" #define CAT_CLOTHING "Clothing" #define CAT_FOOD "Foods" #define CAT_BREAD "Breads" diff --git a/code/datums/components/ducttape.dm b/code/datums/components/ducttape.dm index 85568f7a09c..98512589a46 100644 --- a/code/datums/components/ducttape.dm +++ b/code/datums/components/ducttape.dm @@ -2,20 +2,23 @@ var/x_offset = 0 var/y_offset = 0 var/icon/tape_overlay = null + var/hide_tape = FALSE -/datum/component/ducttape/Initialize(obj/item/I, mob/user, x, y) +/datum/component/ducttape/Initialize(obj/item/I, mob/user, x, y, hide_tape) if(!istype(I)) //Something went wrong return + if(!hide_tape) //if TRUE this hides the tape overlay and added examine text + RegisterSignal(parent, COMSIG_OBJ_UPDATE_ICON, .proc/add_tape_overlay) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/add_tape_text) x_offset = x y_offset = y - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/add_tape_text) - RegisterSignal(parent, COMSIG_OBJ_UPDATE_ICON, .proc/add_tape_overlay) RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/afterattack) RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/pick_up) I.update_icon() //Do this first so the action button properly shows the icon - var/datum/action/item_action/remove_tape/RT = new(I) - if(I.loc == user) - RT.Grant(user) + if(!hide_tape) //the tape can no longer be removed if TRUE + var/datum/action/item_action/remove_tape/RT = new(I) + if(I.loc == user) + RT.Grant(user) /datum/component/proc/add_tape_text(datum/source, mob/user, list/examine_list) examine_list += "There's some sticky tape attached to [source]." diff --git a/code/game/objects/items/decorations.dm b/code/game/objects/items/decorations.dm new file mode 100644 index 00000000000..59ff6574890 --- /dev/null +++ b/code/game/objects/items/decorations.dm @@ -0,0 +1,274 @@ +/obj/item/decorations + icon = 'icons/obj/decorations.dmi' + + +//duct tape decorations +/obj/item/decorations/sticky_decorations + w_class = WEIGHT_CLASS_TINY + +/obj/item/decorations/sticky_decorations/New() + . = ..() + AddComponent(/datum/component/ducttape, src, null, 0, 0, TRUE)//add this to something to make it sticky but without the tape overlay + + + +/obj/item/decorations/sticky_decorations/flammable + resistance_flags = FLAMMABLE + + +//Non-holiday decorations + +/obj/item/decorations/sticky_decorations/flammable/heart + name = "paper heart" + desc = "Do not break." + icon_state = "decoration_heart" + +/obj/item/decorations/sticky_decorations/flammable/star + name = "paper star" + desc = "Throw it and make a wish!" + icon_state = "decoration_star" + +/obj/item/decorations/sticky_decorations/flammable/singleeye + name = "paper eye" + desc = "Feels like it stares into your soul." + icon_state = "paper_eye" + +/obj/item/decorations/sticky_decorations/flammable/googlyeyes + name = "paper googly eyes" + desc = "Seems to be looking at something with interest." + icon_state = "paper_googly_eyes" + +/obj/item/decorations/sticky_decorations/flammable/paperclock + name = "paper clock" + desc = "A paper clock. Right at least twice a day." + icon_state = "paper_clock" + + +//Holiday decorations + +//Halloween decorations + +/obj/item/decorations/sticky_decorations/flammable/jack_o_lantern + name = "paper jack o'lantern" + desc = "A paper jack o'lantern. Although you can't put a candle in him he has a fun loving smile none the less!" + icon_state = "decoration_jack_o_lantern" + +/obj/item/decorations/sticky_decorations/flammable/ghost + name = "paper ghost" + desc = "A paper ghost. If it starts moving on its own, you know who to call." + icon_state = "decoration_ghost" + +/obj/item/decorations/sticky_decorations/flammable/spider + name = "paper spider" + desc = "A paper spider. Creepy but not venomous, thankfully." + icon_state = "decoration_spider" + +/obj/item/decorations/sticky_decorations/flammable/spiderweb + name = "paper spiderweb" + desc = "A paper spiderweb. You see someone wrote 'For Rent' on it." + icon_state = "decoration_spider_web" + +/obj/item/decorations/sticky_decorations/flammable/skull + name = "paper skull" + desc = "A paper skull. Seems a paper skeleton lost their head!" + icon_state = "decoration_skull" + +/obj/item/decorations/sticky_decorations/flammable/skeleton + name = "paper skeleton" + desc = "A paper skeleton. Instead of rattling, his bones rustle." + icon_state = "decoration_skeleton" + +/obj/item/decorations/sticky_decorations/flammable/cauldron + name = "paper cauldron" + desc = "A paper cauldron. Careful, a paper witch might be about." + icon_state = "paper_cauldron" + +//Christmas decorations + +/obj/item/decorations/sticky_decorations/flammable/snowman + name = "paper snowman" + desc = "A paper snowman. This one won't melt when it gets warm." + icon_state = "decoration_snowman" + +/obj/item/decorations/sticky_decorations/flammable/christmas_stocking + name = "paper stocking" + desc = "A paper Christmas stocking. Sadly you won't find gifts in it but at least you won't find coal either." + icon_state = "decoration_christmas_stocking" + +/obj/item/decorations/sticky_decorations/flammable/christmas_tree + name = "paper christmas tree" + desc = "A paper Christmas tree. Maybe someone will leave a present under it?" + icon_state = "decoration_christmas_tree" + +/obj/item/decorations/sticky_decorations/flammable/snowflake + name = "paper snowflake" + desc = "A paper snowflake. Imagine if snow was this big!" + icon_state = "decoration_snowflake" + +/obj/item/decorations/sticky_decorations/flammable/candy_cane + name = "paper candy cane" + desc = "A paper candy cane. Sadly, non-edible." + icon_state = "decoration_candy_cane" + +/obj/item/decorations/sticky_decorations/flammable/mistletoe + name = "paper mistletoe" + desc = "Paper mistletoe. If you stand next to this, expect to be kissed." + icon_state = "decoration_mistletoe" + +/obj/item/decorations/sticky_decorations/flammable/holly + name = "paper holly" + desc = "Paper holly. Wait is it the red berries or the white ones you kiss under?" + icon_state = "decoration_holly" + +//Tinsel + +/obj/item/decorations/sticky_decorations/flammable/tinsel + name = "paper tinsel" + desc = "Paper tinsel, because Nanotrasen is too cheap to buy the real deal." + icon_state = "decoration_tinsel_white" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/red + icon_state = "decoration_tinsel_red" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/blue + icon_state = "decoration_tinsel_blue" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow + icon_state = "decoration_tinsel_yellow" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/purple + icon_state = "decoration_tinsel_purple" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/green + icon_state = "decoration_tinsel_green" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/orange + icon_state = "decoration_tinsel_orange" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/black + icon_state = "decoration_tinsel_black" + +/obj/item/decorations/sticky_decorations/flammable/tinsel/halloween + desc = "Paper tinsel, because Nanotrasen is too cheap to buy the real deal. At least this one is spooky." + icon_state = "decoration_tinsel_halloween" + +//Valentines decorations + + + +/obj/item/decorations/sticky_decorations/flammable/arrowed_heart + name = "paper heart" + desc = "A paper heart. It's been shot through and Cupid is to blame!" + icon_state = "decoration_arrow_heart" + +/obj/item/decorations/sticky_decorations/flammable/heart_chain + name = "paper heart chain" + desc = "A paper chain of hearts. May our hearts always be together." + icon_state = "decoration_heart_chain" + +//St. Patrick's day + +/obj/item/decorations/sticky_decorations/flammable/four_leaf_clover + name = "paper four leaf clover" + desc = "A paper four leaf clover. Take it with you, it might bring good luck!" + icon_state = "decoration_four_leaf_clover" + +/obj/item/decorations/sticky_decorations/flammable/pot_of_gold + name = "paper pot of gold" + desc = "A paper pot of gold. You found the end of the paper rainbow!" + icon_state = "decoration_pot_o_gold" + +/obj/item/decorations/sticky_decorations/flammable/leprechaun_hat + name = "paper leprechaun hat" + desc = "A paper leprechaun hat. If you find the paper leprechaun that dropped this they might give you their pot of paper gold!" + icon_state = "decoration_leprechaun_hat" + +//Easter + +/obj/item/decorations/sticky_decorations/flammable/easter_bunny + name = "paper Easter bunny" + desc = "A paper Easter bunny. Help him find his lost eggs!" + icon_state = "decoration_easter_bunny" + +/obj/item/decorations/sticky_decorations/flammable/easter_egg + name = "paper Easter egg" + desc = "A paper Easter egg. If the chef won't let us use their eggs, then this will have to do." + icon_state = "decoration_easter_egg_blue" + +/obj/item/decorations/sticky_decorations/flammable/easter_egg/yellow + icon_state = "decoration_easter_egg_yellow" + +/obj/item/decorations/sticky_decorations/flammable/easter_egg/red + icon_state = "decoration_easter_egg_red" + +/obj/item/decorations/sticky_decorations/flammable/easter_egg/purple + icon_state = "decoration_easter_egg_purple" + +/obj/item/decorations/sticky_decorations/flammable/easter_egg/orange + icon_state = "decoration_easter_egg_orange" + + + + +/////// +//Decorative structures +/////// + + +/obj/structure/decorative_structures + icon = 'icons/obj/decorations.dmi' + icon_state = "" + density = 1 + anchored = 0 + max_integrity = 100 + +/obj/structure/decorative_structures/metal + flags = CONDUCT + +/obj/structure/decorative_structures/metal/statue/metal_angel + name = "metal angel statue" + desc = "You feel a holy presence looking back at you." + icon_state = "metal_angel_statue" + +/obj/structure/decorative_structures/metal/statue/golden_disk + name = "golden disk statue" + desc = "You aren't sure what the runes say around the large plasma crystal." + icon_state = "golden_disk_statue" + +/obj/structure/decorative_structures/metal/statue/sun + name = "sun statue" + desc = "You wonder if you could be so grossly incandescent." + icon_state = "sun_statue" + +/obj/structure/decorative_structures/metal/statue/tesla + name = "tesla statue" + desc = "Lady Tesla, a powerful and dangerous mistress." + icon_state = "tesla_statue" + +/obj/structure/decorative_structures/metal/statue/moon + name = "moon statue" + desc = "Expect a lot of Vulps to howl around this thing." + icon_state = "moon_statue" + +/obj/structure/decorative_structures/metal/statue/tesla_monument + name = "tesla monument" + desc = "Praise be to lady Tesla!" + icon_state = "tesla_monument" + + +/obj/structure/decorative_structures/flammable + resistance_flags = FLAMMABLE + max_integrity = 50 + + +/obj/structure/decorative_structures/flammable/grandfather_clock + name = "grandfather clock" + desc = "Seems the hands have stopped." + icon_state = "grandfather_clock" + +/obj/structure/decorative_structures/flammable/lava_land_display + name = "lava land display" + desc = "The tomb of many a miner and possibly a home for much worse things." + icon_state = "lava_land_display" + + diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 0bd4060c831..391338fc181 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -8,6 +8,7 @@ CAT_MISC, CAT_PRIMAL, CAT_FOOD, + CAT_DECORATIONS, CAT_CLOTHING) var/list/subcategories = list( list( //Weapon subcategories @@ -20,7 +21,11 @@ CAT_CAKE, CAT_SUSHI, CAT_SANDWICH), - CAT_CLOTHING) //Clothing subcategories + list( //Decoration subcategories + CAT_DECORATION, + CAT_HOLIDAY, + CAT_LARGE_DECORATIONS), + CAT_CLOTHING) //Clothing subcategories var/display_craftable_only = FALSE var/display_compact = TRUE diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index d0ad4b8dc41..b49e20f1302 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -571,3 +571,448 @@ time = 50 category = CAT_MISC always_availible = FALSE + +/datum/crafting_recipe/paper_craft + name = "Paper Heart" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/heart + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 1) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red)//cutters act as makeshift scissors. I doubt the barber wants to have their scissors stolen when somone wants to decorate + category = CAT_DECORATIONS + subcategory = CAT_DECORATION + +/datum/crafting_recipe/paper_craft/single_eye + name = "Paper Eye" + result = /obj/item/decorations/sticky_decorations/flammable/singleeye + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/blue) + category = CAT_DECORATIONS + subcategory = CAT_DECORATION + +/datum/crafting_recipe/paper_craft/googlyeyes + name = "Paper Googly Eye" + result = /obj/item/decorations/sticky_decorations/flammable/googlyeyes + tools = list(/obj/item/wirecutters, + /obj/item/pen) + category = CAT_DECORATIONS + subcategory = CAT_DECORATION + +/datum/crafting_recipe/paper_craft/clock + name = "Paper Clock" + result = /obj/item/decorations/sticky_decorations/flammable/paperclock + tools = list(/obj/item/wirecutters, + /obj/item/pen) + category = CAT_DECORATIONS + subcategory = CAT_DECORATION + +/datum/crafting_recipe/paper_craft/jack_o_lantern + name = "Paper Jack o'Lantern" + result = /obj/item/decorations/sticky_decorations/flammable/jack_o_lantern + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/orange, + /obj/item/toy/crayon/green)//pen ink is black + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/ghost + name = "Paper Ghost" + result = /obj/item/decorations/sticky_decorations/flammable/ghost + tools = list(/obj/item/wirecutters, + /obj/item/pen)//it's white paper why need a white crayon? + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/spider + name = "Paper Spider" + result = /obj/item/decorations/sticky_decorations/flammable/spider + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/spiderweb + name = "Paper Spiderweb" + result = /obj/item/decorations/sticky_decorations/flammable/spiderweb + tools = list(/obj/item/wirecutters) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/skull + name = "Paper Skull" + result = /obj/item/decorations/sticky_decorations/flammable/skull + tools = list(/obj/item/wirecutters, + /obj/item/pen) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/skeleton + name = "Paper Skeleton" + result = /obj/item/decorations/sticky_decorations/flammable/skeleton + tools = list(/obj/item/wirecutters, + /obj/item/pen) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/cauldron + name = "Paper Cauldron" + result = /obj/item/decorations/sticky_decorations/flammable/cauldron + tools = list(/obj/item/wirecutters, + /obj/item/pen) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/snowman + name = "Paper Snowman" + result = /obj/item/decorations/sticky_decorations/flammable/snowman + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/orange) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/christmas_stocking + name = "Paper Christmas Stocking" + result = /obj/item/decorations/sticky_decorations/flammable/christmas_stocking + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/christmas_tree + name = "Paper Christmas Tree" + result = /obj/item/decorations/sticky_decorations/flammable/christmas_tree + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red, + /obj/item/toy/crayon/yellow, + /obj/item/toy/crayon/blue, + /obj/item/toy/crayon/green) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/snowflake + name = "Paper Snowflake" + result = /obj/item/decorations/sticky_decorations/flammable/snowflake + tools = list(/obj/item/wirecutters) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/candy_cane + name = "Paper Candy Cane" + result = /obj/item/decorations/sticky_decorations/flammable/candy_cane + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/mistletoe + name = "Paper Mistletoe" + result = /obj/item/decorations/sticky_decorations/flammable/mistletoe + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red, + /obj/item/toy/crayon/green) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/holly + name = "Paper Holly" + result = /obj/item/decorations/sticky_decorations/flammable/holly + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red, + /obj/item/toy/crayon/green) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_white + name = "Paper Tinsel White" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_red + name = "Red Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/red + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_blue + name = "Blue Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/blue + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/blue) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_yellow + name = "Yellow Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/yellow + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/yellow) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_purple + name = "Purple Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/purple + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/purple) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_green + name = "Green Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/green + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/green) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_orange + name = "Orange Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/orange + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/orange) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_black + name = "Black Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/black + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/pen) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/tinsel_halloween + name = "Halloween style Paper Tinsel" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/tinsel/halloween + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2) + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/orange) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/arrowed_heart + name = "Paper Arrowed Heart" + result = /obj/item/decorations/sticky_decorations/flammable/arrowed_heart + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/heart_chain + name = "Paper Heart Chain" + result = /obj/item/decorations/sticky_decorations/flammable/heart_chain + reqs = list(/obj/item/paper = 1, + /obj/item/stack/tape_roll = 2, + /obj/item/stack/cable_coil = 2) + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/four_leaf_clover + name = "Paper Four Leaf Clover" + result = /obj/item/decorations/sticky_decorations/flammable/four_leaf_clover + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/green) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/pot_of_gold + name = "Paper Pot of Gold" + result = /obj/item/decorations/sticky_decorations/flammable/pot_of_gold + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/red, + /obj/item/toy/crayon/yellow, + /obj/item/toy/crayon/orange, + /obj/item/toy/crayon/green, + /obj/item/toy/crayon/blue, + /obj/item/toy/crayon/purple) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/leprechaun_hat + name = "Paper Leprechaun Hat" + time = 10 + result = /obj/item/decorations/sticky_decorations/flammable/leprechaun_hat + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/yellow, + /obj/item/toy/crayon/green) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/easter_bunny + name = "Paper Easter Bunny" + result = /obj/item/decorations/sticky_decorations/flammable/easter_bunny + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/toy/crayon/blue, + /obj/item/toy/crayon/purple) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/easter_egg_blue + name = "Blue Paper Easter Egg" + result = /obj/item/decorations/sticky_decorations/flammable/easter_egg + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/blue) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/easter_egg_yellow + name = "Yellow Paper Easter Egg" + result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/yellow + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/yellow) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/easter_egg_red + name = "Red Paper Easter Egg" + result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/red + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/easter_egg_purple + name = "Purple Paper Easter Egg" + result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/purple + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/purple) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/paper_craft/easter_egg_orange + name = "Orange Paper Easter Egg" + result = /obj/item/decorations/sticky_decorations/flammable/easter_egg/orange + tools = list(/obj/item/wirecutters, + /obj/item/toy/crayon/orange) + category = CAT_DECORATIONS + subcategory = CAT_HOLIDAY + +/datum/crafting_recipe/metal_angel_statue + name = "Metal angel statue" + time = 50 + result = /obj/structure/decorative_structures/metal/statue/metal_angel + reqs = list(/obj/item/stack/sheet/metal = 10, + /obj/item/stack/sheet/mineral/gold = 6) + tools = list(/obj/item/weldingtool) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/golden_disk_statue + name = "Golden disk statue" + time = 50 + result = /obj/structure/decorative_structures/metal/statue/golden_disk + reqs = list(/obj/item/stack/sheet/metal = 10, + /obj/item/stack/sheet/mineral/plasma = 3, + /obj/item/stack/sheet/mineral/gold = 8) + tools = list(/obj/item/weldingtool) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/sun_statue + name = "Sun statue" + time = 40 + result = /obj/structure/decorative_structures/metal/statue/sun + reqs = list(/obj/item/stack/sheet/metal = 6, + /obj/item/stack/sheet/mineral/gold = 4) + tools = list(/obj/item/weldingtool) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/moon_statue + name = "Moon statue" + time = 50 + result = /obj/structure/decorative_structures/metal/statue/moon + reqs = list(/obj/item/stack/sheet/metal = 6, + /obj/item/stack/sheet/mineral/silver = 6, + /obj/item/stack/sheet/mineral/gold = 4) + tools = list(/obj/item/weldingtool) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/tesla_statue + name = "Tesla statue" + time = 40 + result = /obj/structure/decorative_structures/metal/statue/tesla + reqs = list(/obj/item/stack/sheet/metal = 4, + /obj/item/stack/sheet/glass = 8) + tools = list(/obj/item/weldingtool) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/tesla_monument + name = "Tesla monument" + time = 50 + result = /obj/structure/decorative_structures/metal/statue/tesla_monument + reqs = list(/obj/item/stack/sheet/metal = 8, + /obj/item/stock_parts/cell = 3, + /obj/item/stack/cable_coil = 4) + tools = list(/obj/item/weldingtool) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/grandfather_clock + name = "Grandfather clock" + time = 50 + result = /obj/structure/decorative_structures/flammable/grandfather_clock + reqs = list(/obj/item/stack/sheet/wood = 5, + /obj/item/stack/sheet/mineral/gold = 1, + /obj/item/stack/sheet/glass = 2) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS + +/datum/crafting_recipe/lava_land_display + name = "Lava land display" + time = 50 + result = /obj/structure/decorative_structures/flammable/lava_land_display + reqs = list(/obj/item/paper = 4, + /obj/item/stack/sheet/wood = 4, + /obj/item/stack/rods = 4, + /obj/item/stock_parts/cell = 1, + /obj/item/stack/cable_coil = 4)//thing is a wireframe construct with an electro magnetic hover field + tools = list(/obj/item/wirecutters, + /obj/item/pen, + /obj/item/weldingtool, + /obj/item/toy/crayon/red) + category = CAT_DECORATIONS + subcategory = CAT_LARGE_DECORATIONS diff --git a/icons/obj/decorations.dmi b/icons/obj/decorations.dmi index a3b7f9dcd20..8bbfa2e3592 100644 Binary files a/icons/obj/decorations.dmi and b/icons/obj/decorations.dmi differ diff --git a/paradise.dme b/paradise.dme index 35725ea6bbf..62d9624cf5c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -844,6 +844,7 @@ #include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\control_wand.dm" #include "code\game\objects\items\crayons.dm" +#include "code\game\objects\items\decorations.dm" #include "code\game\objects\items\dehy_carp.dm" #include "code\game\objects\items\documents.dm" #include "code\game\objects\items\flag.dm"