[Test Merge] Ceramics, Chiseling, Teapots, Valuable House items, Water Arrows, and Map sprite tweaks

code/datums/skills/misc.dm

@@ -98,3 +98,11 @@
 		"...as the years go by, the mantra becomes increasingly oppressive. Stitch, sew, cut ties, stitch, sew, thread the needle twice...",
 		"...you turn over the fabric, and within the two layers of the gown, you hide a secret stitched into the gown, your initials, hidden within. A forbidden mark in some cultures... you never liked the bride much..."
 	)
+
+/datum/skill/misc/ceramics
+	name = "Pottery"
+	desc = "Handles crafting and making of clay into vases and other fine-craft works."
+	dreams = list(
+		"...the wheel spins, and spins.. yet you watch as a work of art grows from its center...",
+		"...a slab of clay is molded into a beautiful statue. A testiment to Malum's blessings, and Xylix's insperation. A pure work of beauty..."
+	)

code/datums/status_effects/rogue/roguebuff.dm

@@ -46,6 +46,26 @@
 	desc = ""
 	icon_state = "foodbuff"
 
+//coffee buff
+/datum/status_effect/buff/vigorized
+	id = "vigorized"
+	alert_type = /atom/movable/screen/alert/status_effect/vigorized
+	duration = 10 MINUTES
+	effectedstats = list("speed" = 1, "intelligence" = 1)
+
+/atom/movable/screen/alert/status_effect/vigorized
+	name = "Vigorized"
+	desc = "I feel a surge of energy inside, quickening my speed and sharpening my focus."
+	icon_state = "drunk"
+
+/datum/status_effect/buff/vigorized/on_apply()
+	. = ..()
+	to_chat(owner, span_warning("I feel a surge of energy inside me!"))
+
+/datum/status_effect/buff/vigorized/on_remove()
+	. = ..()
+	to_chat(owner, span_warning("The surge of energy inside me fades..."))
+
 /datum/status_effect/buff/druqks
 	id = "druqks"
 	alert_type = /atom/movable/screen/alert/status_effect/buff/druqks

code/game/objects/effects/decals/cleanable/misc.dm

@@ -103,21 +103,6 @@
 		desc = ""
 	. = ..()
 
-/obj/effect/decal/cleanable/glass
-	name = "tiny shards"
-	desc = ""
-	icon = 'icons/effects/debris.dmi'
-	icon_state = "tiny"
-	beauty = -100
-
-/obj/effect/decal/cleanable/glass/Initialize(mapload)
-	. = ..()
-	setDir(pick(GLOB.cardinals))
-
-/obj/effect/decal/cleanable/glass/ex_act()
-	qdel(src)
-	return TRUE
-
 /obj/effect/decal/cleanable/glitter
 	name = "generic glitter pile"
 	desc = ""
@@ -158,3 +143,39 @@
 	icon = 'icons/effects/confetti_and_decor.dmi'
 	icon_state = "confetti"
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT //the confetti itself might be annoying enough
+
+//................	Debris decals (result from crafting or destroying items thats just visual)	............... //
+/obj/effect/decal/cleanable/debris
+	name = ""
+	desc = ""
+	icon = 'icons/roguetown/items/crafting.dmi'
+	icon_state = "tiny"
+	beauty = -20
+/obj/effect/decal/cleanable/debris/Initialize()
+	. = ..()
+	setDir(pick(GLOB.cardinals))
+
+/obj/effect/decal/cleanable/debris/glassy
+	name = "glass shards"
+	icon_state = "tiny"
+	beauty = -100
+/obj/effect/decal/cleanable/debris/glassy/Crossed(mob/living/L)
+	. = ..()
+	playsound(loc,'sound/foley/glass_step.ogg', 50, FALSE)
+
+/obj/effect/decal/cleanable/debris/stony
+	name = "stone chippings"
+	icon_state = "pebbly"
+
+/obj/effect/decal/cleanable/debris/woody	// sawdust gets cleared by weather
+	name = "sawdust"
+	icon_state = "woody"
+/obj/effect/decal/cleanable/debris/woody/Initialize()
+	START_PROCESSING(SSprocessing, src)
+	GLOB.weather_act_upon_list += src
+	. = ..()
+/obj/effect/decal/cleanable/debris/woody/Destroy()
+	STOP_PROCESSING(SSprocessing, src)
+	GLOB.weather_act_upon_list -= src
+	. = ..()
+/obj/effect/decal/cleanable/debris/woody/weath

code/game/objects/effects/spawners/lootdrops/dungeons.dm

@@ -227,8 +227,8 @@
 		/obj/item/storage/roguebag/crafted = 3,
 		/obj/item/clothing/mask/cigarette/pipe = 3,
 		/obj/item/clothing/mask/cigarette/rollie = 3,
-		/datum/crafting_recipe/roguetown/sigsweet = 2,
-		/datum/crafting_recipe/roguetown/sigdry = 2,
+		/datum/crafting_recipe/roguetown/survival/sigsweet = 2,
+		/datum/crafting_recipe/roguetown/survival/sigdry = 2,
 		/obj/item/paper = 3,
 		/obj/item/reagent_containers/glass/bowl = 3,
 		/obj/item/storage/bag/tray = 3,

code/game/objects/items/candle.dm

@@ -122,5 +122,89 @@
 /obj/item/candle/skull/lit
 	start_lit = TRUE
 	icon_state = "skullcandle_lit"
+
+/obj/item/candle/candlestick/gold
+	name = "three-stick gold candlestick"
+	icon = 'icons/roguetown/items/lighting.dmi'
+	icon_state = "gcandelabra"
+	infinite = TRUE
+	sellprice = 40
+
+/obj/item/candle/candlestick/gold/update_icon()
+	icon_state = "gcandelabra[lit ? "_lit" : ""]"
+
+/obj/item/candle/candlestick/gold/lit
+	icon_state = "gcandelabra_lit"
+	start_lit = TRUE
+
+/obj/item/candle/candlestick/silver
+	name = "three-stick silver candlestick"
+	icon = 'icons/roguetown/items/lighting.dmi'
+	icon_state = "scandelabra"
+	infinite = TRUE
+	sellprice = 60
+
+/obj/item/candle/candlestick/silver/update_icon()
+	icon_state = "scandelabra[lit ? "_lit" : ""]"
+
+/obj/item/candle/candlestick/silver/lit
+	icon_state = "scandelabra_lit"
+	start_lit = TRUE
+
+/obj/item/candle/candlestick/gold/single
+	name = "one-stick gold candlestick"
+	icon = 'icons/roguetown/items/lighting.dmi'
+	icon_state = "singlegcandelabra"
+	infinite = TRUE
+	sellprice = 30
+
+/obj/item/candle/candlestick/gold/single/update_icon()
+	icon_state = "singlegcandelabra[lit ? "_lit" : ""]"
+
+/obj/item/candle/candlestick/gold/single/lit
+	icon_state = "singlegcandelabra_lit"
+	start_lit = TRUE
+
+/obj/item/candle/candlestick/silver/single
+	name = "one-stick silver candlestick"
+	icon = 'icons/roguetown/items/lighting.dmi'
+	icon_state = "singlescandelabra"
+	infinite = TRUE
+	sellprice = 50
+
+/obj/item/candle/candlestick/silver/single/update_icon()
+	icon_state = "singlescandelabra[lit ? "_lit" : ""]"
+
+/obj/item/candle/candlestick/silver/single/lit
+	icon_state = "singlescandelabra_lit"
+	start_lit = TRUE
+
+/obj/item/candle/gold
+	name = "gold candle"
+	icon = 'icons/roguetown/items/lighting.dmi'
+	icon_state = "gcandle"
+	infinite = TRUE
+	sellprice = 30
+
+/obj/item/candle/gold/update_icon()
+	icon_state = "gcandle[lit ? "_lit" : ""]"
+
+/obj/item/candle/gold/lit
+	icon_state = "gcandle_lit"
+	start_lit = TRUE
+
+/obj/item/candle/silver
+	name = "silver candle"
+	icon = 'icons/roguetown/items/lighting.dmi'
+	icon_state = "scandle"
+	infinite = TRUE
+	sellprice = 50
+
+/obj/item/candle/silver/update_icon()
+	icon_state = "scandle[lit ? "_lit" : ""]"
+
+/obj/item/candle/silver/lit
+	icon_state = "scandle_lit"
+	start_lit = TRUE
 
 #undef CANDLE_LUMINOSITY

code/game/objects/items/devices/flashlight.dm

@@ -273,6 +273,7 @@
 	light_outer_range = 6
 	fuel = 120 MINUTES
 	should_self_destruct = TRUE
+	extinguishable = TRUE
 
 /obj/item/flashlight/flare/torch/metal/afterattack(atom/movable/A, mob/user, proximity)
 	. = ..()
@@ -294,7 +295,7 @@
 	name = "iron lamptern"
 	icon_state = "lamp"
 	desc = "A light to guide the way."
-	light_outer_range = 7
+	light_outer_range = 5
 	on = FALSE
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_HIP
@@ -304,6 +305,8 @@
 	should_self_destruct = FALSE
 	grid_width = 32
 	grid_height = 64
+	extinguishable = FALSE
+	weather_resistant = TRUE
 
 /obj/item/flashlight/flare/torch/lantern/afterattack(atom/movable/A, mob/user, proximity)
 	. = ..()
@@ -322,9 +325,6 @@
 		turn_off()
 		STOP_PROCESSING(SSobj, src)
 
-/obj/item/flashlight/flare/torch/lantern/extinguish()
-	return
-
 /obj/item/flashlight/flare/torch/lantern/getonmobprop(tag)
 	. = ..()
 	if(tag)
@@ -343,15 +343,14 @@
 	icon_state = "bronzelamp"
 	item_state = "bronzelamp"
 	desc = "A marvel of engineering that emits a pale green glow."
-	light_outer_range = 8
+	light_outer_range = 6
 	light_color ="#bdf4d4"
 	on = FALSE
 
 /obj/item/flashlight/flare/torch/lantern/copper
 	name = "copper lamptern"
 	icon_state = "clamp"
 	desc = "A simple and cheap lamptern."
-	light_outer_range = 7
 	on = FALSE
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_HIP

code/game/objects/items/rogueitems/ceramics.dm

@@ -0,0 +1,129 @@
+/* Tools for using with Pottery */
+
+/* Items made from Pottery */
+
+// Uncooked items -- Still need to be brought to a kiln
+// Those are all children of natural/clay so that they can inherit the Glaze method.
+
+//Bottle - subtype of glass bottle
+/obj/item/natural/clay/claybottle
+	name = "unglazed clay bottle"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claybottleraw"
+	desc = "A bottle fashioned from clay. Still needs to be glazed to be useful."
+	cooked_type = /obj/item/reagent_containers/glass/bottle/claybottle
+
+/obj/item/reagent_containers/glass/bottle/claybottle
+	name = "clay vessel"
+	desc = "A small ceramic bottle."
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claybottlecook"
+	sellprice = 6
+	reagent_flags = OPENCONTAINER	//So it doesn't appear through
+
+//Vase - bigger bottle
+/obj/item/natural/clay/clayvase
+	name = "unglazed clay vase"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "clayvaseraw"
+	desc = "A vase fashioned from clay. Still needs to be glazed to be useful."
+	cooked_type = /obj/item/reagent_containers/glass/bottle/clayvase
+
+/obj/item/reagent_containers/glass/bottle/clayvase
+	name = "ceramic vase"
+	desc = "A large sized ceramic vase."
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "clayvasecook"
+	volume = 65 // Larger than glass bottle
+	sellprice = 9
+	reagent_flags = OPENCONTAINER	//So it doesn't appear through
+
+//Fancy vase - bigger bottle + fancy
+/obj/item/natural/clay/clayfancyvase
+	name = "unglazed fancy clay vase"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "clayfancyvaseraw"
+	desc = "A fancy vase fashioned from clay. Still needs to be glazed to be useful."
+	cooked_type = /obj/item/reagent_containers/glass/bottle/clayfancyvase
+
+/obj/item/reagent_containers/glass/bottle/clayfancyvase
+	name = "fancy ceramic vase"
+	desc = "A large sized fancy ceramic vase."
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "clayfancyvasecook"
+	volume = 65 // Larger than glass bottle
+	sellprice = 14
+	reagent_flags = OPENCONTAINER	//So it doesn't appear through
+
+//Flask (was a cup) - subtype of regular cup but can shatter.
+/obj/item/natural/clay/claycup
+	name = "unglazed clay flask"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claycupraw"
+	desc = "A small flask fashioned from clay. Still needs to be glazed to be useful."
+	cooked_type = /obj/item/reagent_containers/glass/cup/claycup
+
+/obj/item/reagent_containers/glass/cup/claycup
+	name = "clay flask"
+	desc = "A small ceramic flask."
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claybottlecook"
+	sellprice = 3
+	reagent_flags = OPENCONTAINER	//So it doesn't appear through
+
+// Raw teapot
+/obj/item/natural/clay/rawteapot
+	name = "raw teapot"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "teapot_raw"
+	desc = "A teapot fashioned from clay. Still needs to be baked to be useful."
+	cooked_type = /obj/item/reagent_containers/glass/bucket/pot/teapot
+
+// Raw teacup
+/obj/item/natural/clay/rawteacup
+	name = "raw teacup"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "teacup_raw"
+	desc = "A teacup fashioned from clay. Still needs to be baked to be useful."
+	cooked_type = /obj/item/reagent_containers/glass/cup/ceramic
+
+//Bricks - Makes bricks which are used for building. (Need brick-wall sprites for this.. augh..)
+/obj/item/natural/clay/claybrick
+	name = "uncooked clay brick"
+	desc = "an uncooked clay brick. Still needs to be cooked in a kilm."
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claybrickraw"
+	cooked_type = /obj/item/natural/brick
+
+
+//Statues - Basically cheapest version of the metal-made statues, but way easier to make given no rare material usage. Just skill. Plus, dyeable.
+/obj/item/natural/clay/claystatue
+	name = "uncooked clay statue"
+	desc = "an uncooked clay statue. Still needs to be cooked in a kilm."
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claystatueraw"
+	cooked_type = /obj/item/roguestatue/clay
+
+/obj/item/roguestatue/clay
+	name = "ceramic statue"
+	desc = "A ceramic statue, shining in its eligance!"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "claystatuecooked1"
+	smeltresult = null	//No resource return
+	sellprice = 15		//Iron is worth 20, so these gotta be a little cheaper
+
+/obj/item/roguestatue/clay/Initialize()
+	. = ..()
+	icon_state = "claystatuecook[pick(1,2)]"
+
+/obj/item/roguestatue/glass
+	name = "glass statue"
+	desc = "A statue made of fine glass. An incredible amount of skill must have went into this fragile masterpiece!"
+	icon = 'icons/roguetown/items/cooking.dmi'
+	icon_state = "statueglass1"
+	smeltresult = null	//No resource return
+	sellprice = 70		//Silver is roughly 90 mammon, steel is 40. This sits roughly between. It's high skill to make and a bit of a grind so - worth it since resources to make aren't rare..
+
+/obj/item/roguestatue/glass/Initialize()
+	. = ..()
+	icon_state = "statueglass[pick(1,2)]"