Merge pull request #11643 from Markolie/turfs

Lavaland fixes, continued

code/game/objects/effects/temporary_visuals/temporary_visual.dm

@@ -1,16 +1,23 @@
 //temporary visual effects
 /obj/effect/temp_visual
-	anchored = 1
+	icon_state = "nothing"
+	anchored = TRUE
 	layer = ABOVE_MOB_LAYER
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	var/duration = 10
+	var/duration = 10 //in deciseconds
 	var/randomdir = TRUE
+	var/timerid
 
-/obj/effect/temp_visual/New()
+/obj/effect/temp_visual/Initialize(mapload)
+	. = ..()
 	if(randomdir)
 		setDir(pick(cardinal))
 
-	QDEL_IN(src, duration)
+	timerid = QDEL_IN(src, duration)
+
+/obj/effect/temp_visual/Destroy()
+	. = ..()
+	deltimer(timerid)
 
 /obj/effect/temp_visual/singularity_act()
 	return
@@ -24,7 +31,7 @@
 /obj/effect/temp_visual/dir_setting
 	randomdir = FALSE
 
-/obj/effect/temp_visual/dir_setting/New(loc, set_dir)
+/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir)
 	if(set_dir)
 		setDir(set_dir)
-	..()
+	. = ..()

code/game/objects/items.dm

@@ -149,6 +149,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 /obj/item/blob_act()
 	qdel(src)
 
+/obj/item/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
+	extinguish()
+
 /obj/item/verb/move_to_top()
 	set name = "Move To Top"
 	set category = null

code/game/objects/items/dehy_carp.dm

@@ -22,6 +22,10 @@
 		owned = 0
 	return ..()
 
+/obj/item/toy/carpplushie/dehy_carp/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
+	if(volume >= 1)
+		Swell()
 
 /obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity)
 	if(!proximity) return

code/game/objects/items/stacks/sheets/leather.dm

@@ -205,7 +205,12 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	else
 		..()
 
-//Step two - washing..... it's actually in washing machine code.
+//Step two - washing (also handled by water reagent code and washing machine code)
+/obj/item/stack/sheet/hairlesshide/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
+	if(volume >= 10)
+		new /obj/item/stack/sheet/wetleather(get_turf(src), amount)
+		qdel(src)
 
 //Step three - drying
 /obj/item/stack/sheet/wetleather/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -385,8 +385,8 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
 GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = 1, on_floor = 1, time = 40), \
 	new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2), \
-	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/food/drinks/waterbottle/empty), \
-	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/food/drinks/waterbottle/large/empty,3), \
+	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
+	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
 	new /datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = 1, on_floor = 1), \
 	new /datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1), \
 	new /datum/stack_recipe("plastic fork", /obj/item/kitchen/utensil/pfork, 1, on_floor = 1), \

code/game/objects/structures/watercloset.dm

@@ -600,7 +600,7 @@
 				wateract = (W.wash(user, src))
 				busy = 0
 				if(wateract)
-					W.water_act(20,310.15,src)
+					W.water_act(20, 310.15, src)
 			if("Disconnect")
 				user.visible_message("<span class='notice'>[user] starts disconnecting [src].</span>", "<span class='notice'>You begin disconnecting [src]...</span>")
 				if(do_after(user, 40 * O.toolspeed, target = src))
@@ -633,7 +633,7 @@
 	wateract = (O.wash(user, src))
 	busy = 0
 	if(wateract)
-		O.water_act(20,310.15,src)
+		O.water_act(20, 310.15, src)
 
 /obj/structure/sink/update_icon()
 	..()