Merge pull request NebulaSS13#4594 from MistakeNot4892/feature/doeicons

Adding various fancy goods from Doe's icon set.

code/game/objects/items/__item.dm

@@ -175,12 +175,15 @@
 
 	// This is a bit gross, but it makes writing rings and necklaces much easier.
 	// If the decorations list is already populated at this point, we assume it's
-	// prebaked decorations. Only things handled appropriately at the moment are gems.
+	// prebaked decorations.
+	// Only things handled appropriately at the moment are gems and material inlays.
 	if(length(decorations))
 		for(var/decoration_type in decorations)
 			decorations -= decoration_type
 			if(ispath(decoration_type, /obj/item/gemstone))
 				decorations[GET_DECL(/decl/item_decoration/setting)] = list("object" = new decoration_type(src))
+			else if(ispath(decoration_type, /decl/material))
+				decorations[GET_DECL(/decl/item_decoration/inset)]   = list("material" = GET_DECL(decoration_type))
 			else
 				PRINT_STACK_TRACE("Item [type] tried to initialize with an unsupported initial decoration type ('[decoration_type]')")
 	. = ..()

code/modules/crafting/handmade_fancy.dm

@@ -0,0 +1,58 @@
+/obj/item/chems/glass/handmade/fancy
+	abstract_type = /obj/item/chems/glass/handmade/fancy
+	material = /decl/material/solid/metal/silver
+
+/obj/item/chems/glass/handmade/fancy/get_single_monetary_worth()
+	. = ..() * 1.5 // Crafting value, todo proper crafting skill modifying sale price.
+
+/obj/item/chems/glass/handmade/fancy/decanter
+	name = "decanter"
+	desc = "A masterfully made decanter with a fluted neck and graceful handle."
+	icon = 'icons/obj/items/handmade/decanter.dmi'
+	amount_per_transfer_from_this = 10
+	volume = 120
+	obj_flags = OBJ_FLAG_HOLLOW | OBJ_FLAG_INSULATED_HANDLE
+
+/obj/item/chems/glass/handmade/fancy/goblet
+	name = "goblet"
+	desc = "An elegant goblet with a flared base, likely handmade by some master artisan."
+	icon = 'icons/obj/items/handmade/cup_fancy.dmi'
+	amount_per_transfer_from_this = 10
+	volume = 60
+
+/obj/item/chems/glass/handmade/fancy/bowl
+	name = "bowl"
+	desc = "A sleek, polished bowl, likely handmade by some master artisan."
+	icon = 'icons/obj/items/handmade/bowl_fancy.dmi'
+	amount_per_transfer_from_this = 10
+	volume = 60
+
+/obj/item/chems/glass/handmade/fancy/vase
+	name = "vase"
+	desc = "An elegant masterwork vase."
+	icon = 'icons/obj/items/handmade/vase_fancy.dmi'
+	amount_per_transfer_from_this = 20
+	volume = 240
+	material = /decl/material/solid/stone/ceramic
+
+/obj/item/chems/glass/handmade/fancy/vase/fluted
+	desc = "An elegant masterwork vase with a fluted neck."
+	icon = 'icons/obj/items/handmade/vase_fancy_fluted.dmi'
+
+/obj/item/chems/glass/handmade/fancy/vase/fluted/update_name()
+	. = ..()
+	SetName("fluted [name]")
+
+// Decorated subtypes for mapping/
+/obj/item/chems/glass/handmade/fancy/vase/mapped
+	decorations = list(/decl/material/solid/organic/bone)
+
+/obj/item/chems/glass/handmade/fancy/vase/fluted/mapped
+	decorations = list(/decl/material/solid/organic/bone)
+
+/obj/item/chems/glass/handmade/fancy/goblet/mapped
+	material = /decl/material/solid/metal/gold
+	decorations = list(/obj/item/gemstone/octagon/ruby)
+
+/obj/item/chems/glass/handmade/fancy/bowl/mapped
+	decorations = list(/obj/item/gemstone/octagon/sapphire)

code/modules/crafting/handmade_items.dm

@@ -12,59 +12,59 @@
 /obj/item/chems/glass/handmade/teapot
 	name = "teapot"
 	desc = "A handmade, slightly lumpy teapot."
-	icon = 'icons/obj/pottery/teapot.dmi'
+	icon = 'icons/obj/items/handmade/teapot.dmi'
 	amount_per_transfer_from_this = 10
 	volume = 120
 	obj_flags = OBJ_FLAG_HOLLOW | OBJ_FLAG_INSULATED_HANDLE
 
 /obj/item/chems/glass/handmade/cup
 	name = "cup"
 	desc = "A handmade, slightly lumpy cup."
-	icon = 'icons/obj/pottery/cup.dmi'
+	icon = 'icons/obj/items/handmade/cup.dmi'
 	amount_per_transfer_from_this = 10
 	volume = 30
 
 /obj/item/chems/glass/handmade/mug
 	name = "mug"
 	desc = "A handmade, slightly lumpy mug."
-	icon = 'icons/obj/pottery/mug.dmi'
+	icon = 'icons/obj/items/handmade/mug.dmi'
 	amount_per_transfer_from_this = 10
 	volume = 60
 	obj_flags = OBJ_FLAG_HOLLOW | OBJ_FLAG_INSULATED_HANDLE
 
 /obj/item/chems/glass/handmade/vase
 	name = "vase"
 	desc = "A handmade, slightly lumpy vase."
-	icon = 'icons/obj/pottery/vase.dmi'
+	icon = 'icons/obj/items/handmade/vase.dmi'
 	amount_per_transfer_from_this = 20
 	volume = 240
 
 /obj/item/chems/glass/handmade/jar
 	name = "jar"
 	desc = "A handmade, slightly lumpy jar."
-	icon = 'icons/obj/pottery/jar.dmi'
+	icon = 'icons/obj/items/handmade/jar.dmi'
 	amount_per_transfer_from_this = 10
 	volume = 60
 
 /obj/item/chems/glass/handmade/bottle
 	name = "bottle"
 	desc = "A handmade, slightly lumpy bottle."
-	icon = 'icons/obj/pottery/bottle.dmi'
+	icon = 'icons/obj/items/handmade/bottle.dmi'
 	amount_per_transfer_from_this = 10
 	volume = 120
 
 /obj/item/chems/glass/handmade/bottle/tall
 	name = "tall bottle"
-	icon = 'icons/obj/pottery/bottle_tall.dmi'
+	icon = 'icons/obj/items/handmade/bottle_tall.dmi'
 
 /obj/item/chems/glass/handmade/bottle/wide
 	name = "wide bottle"
-	icon = 'icons/obj/pottery/bottle_wide.dmi'
+	icon = 'icons/obj/items/handmade/bottle_wide.dmi'
 
 /obj/item/chems/glass/handmade/bowl
 	name = "bowl"
 	desc = "A handmade, slightly lumpy bowl."
-	icon = 'icons/obj/pottery/bowl.dmi'
+	icon = 'icons/obj/items/handmade/bowl.dmi'
 	amount_per_transfer_from_this = 10
 	volume = 60
 
@@ -77,7 +77,6 @@
 /obj/item/chems/glass/handmade/bowl/wood
 	material = /decl/material/solid/organic/wood/oak
 
-
 /obj/item/chems/glass/handmade/bottle/beer/populate_reagents()
 	. = ..()
 	add_to_reagents(/decl/material/liquid/ethanol/beer, reagents.maximum_volume)

code/modules/crafting/stack_recipes/recipes_planks.dm

@@ -78,6 +78,26 @@
 /decl/stack_recipe/planks/bowl
 	result_type            = /obj/item/chems/glass/handmade/bowl
 
+/decl/stack_recipe/planks/fancy
+	abstract_type          = /decl/stack_recipe/planks/fancy
+	difficulty             = MAT_VALUE_VERY_HARD_DIY
+
+/decl/stack_recipe/planks/fancy/decanter
+	result_type            = /obj/item/chems/glass/handmade/fancy/decanter
+
+/decl/stack_recipe/planks/fancy/goblet
+	result_type            = /obj/item/chems/glass/handmade/fancy/goblet
+
+/decl/stack_recipe/planks/fancy/bowl
+	result_type            = /obj/item/chems/glass/handmade/fancy/bowl
+
+/decl/stack_recipe/planks/fancy/vase
+	result_type            = /obj/item/chems/glass/handmade/fancy/vase
+
+/decl/stack_recipe/planks/fancy/vase_fluted
+	name                   = "vase, fluted"
+	result_type            = /obj/item/chems/glass/handmade/fancy/vase/fluted
+
 /decl/stack_recipe/planks/noticeboard/spawn_result(mob/user, location, amount, decl/material/mat, decl/material/reinf_mat, paint_color, spent_type, spent_amount = 1)
 	. = ..()
 	if(user)

code/modules/decoration/decoration_inset.dm

@@ -0,0 +1,14 @@
+// Sort of a placeholder for future generalised decorations.
+/decl/item_decoration/inset
+	name = "inlay material"
+	icon_state_modifier = "-inlay"
+	can_decorate_types = list(
+		/obj/item/chems/glass/handmade/fancy/vase
+	)
+	can_decorate_with_types = list(
+		/obj/item/stack/material/plank = 1,
+		/obj/item/stack/material/bone  = 1,
+		/obj/item/stack/material/ingot = 1,
+		/obj/item/stack/material/sheet = 1,
+		/obj/item/stack/material/brick = 1
+	)

code/modules/materials/definitions/solids/materials_solid_metal.dm

@@ -78,6 +78,7 @@
 
 /decl/material/solid/metal/gold
 	name = "gold"
+	adjective_name = "golden"
 	codex_name = "elemental gold"
 	uid = "solid_gold"
 	lore_text = "A heavy, soft, ductile metal. Once considered valuable enough to back entire currencies, now predominantly used in corrosion-resistant electronics."

nebula.dme

@@ -2197,6 +2197,7 @@
 #include "code\modules\codex\entries\tools.dm"
 #include "code\modules\codex\entries\turfs.dm"
 #include "code\modules\codex\entries\weapons.dm"
+#include "code\modules\crafting\handmade_fancy.dm"
 #include "code\modules\crafting\handmade_items.dm"
 #include "code\modules\crafting\metalwork\metalwork_items.dm"
 #include "code\modules\crafting\pottery\pottery_moulds.dm"
@@ -2245,6 +2246,7 @@
 #include "code\modules\crafting\working\textiles\spinning_wheel.dm"
 #include "code\modules\crafting\working\textiles\twisting_bench.dm"
 #include "code\modules\decoration\_decoration.dm"
+#include "code\modules\decoration\decoration_inset.dm"
 #include "code\modules\decoration\decoration_item.dm"
 #include "code\modules\decoration\decoration_setting.dm"
 #include "code\modules\departments\department.dm"