Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

code/game/objects/structures/shower.dm

@@ -138,10 +138,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
 
 /obj/machinery/shower/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
 	user.balloon_alert_to_viewers("furiously plunging...", "plunging shower...")
-	if(do_after(user, 3 SECONDS, target = src))
-		user.balloon_alert_to_viewers("finished plunging")
-		reagents.expose(get_turf(src), TOUCH) //splash on the floor
-		reagents.clear_reagents()
+	if(!do_after(user, 3 SECONDS, target = src))
+		return TRUE
+	user.balloon_alert_to_viewers("finished plunging")
+	reagents.expose(get_turf(src), TOUCH) //splash on the floor
+	reagents.clear_reagents()
+	begin_processing()
+	return TRUE
 
 /obj/machinery/shower/attackby(obj/item/tool, mob/user, list/modifiers, list/attack_modifiers)
 	if(istype(tool, /obj/item/stock_parts/water_recycler))

code/game/objects/structures/water_structures/sink.dm

@@ -159,13 +159,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
 		O.play_tool_sound(src)
 		has_water_reclaimer = FALSE
 		new/obj/item/stock_parts/water_recycler(get_turf(loc))
-		to_chat(user, span_notice("You remove the water reclaimer from [src]"))
-		return
-
-	if(istype(O, /obj/item/stack/ore/glass))
-		new /obj/item/stack/sheet/sandblock(loc)
-		to_chat(user, span_notice("You wet the sand in the sink and form it into a block."))
-		O.use(1)
+		to_chat(user, span_notice("You remove the water reclaimer from [src]."))
 		return
 
 	if(istype(O, /obj/item/stock_parts/water_recycler))

code/game/objects/structures/water_structures/toilet.dm

@@ -7,45 +7,71 @@
 	density = FALSE
 	anchored = TRUE
 
-	///Boolean if whether the toilet is currently flushing.
+	/// Boolean if whether the toilet is currently flushing.
 	var/flushing = FALSE
-	///Boolean if the toilet seat is up.
+	/// Boolean if the toilet seat is up.
 	var/cover_open = FALSE
-	///Boolean if the cistern is up, allowing items to be put in/out.
+	/// Boolean if the cistern is up, allowing items to be put in/out.
 	var/cistern_open = FALSE
-	///The combined weight of all items in the cistern put together.
+	/// The combined weight of all items in the cistern put together.
 	var/w_items = 0
-	///Reference to the mob being given a swirlie.
+	/// Reference to the mob being given a swirlie.
 	var/mob/living/swirlie
-	///The type of material used to build the toilet.
+	/// The type of material used to build the toilet.
 	var/buildstacktype = /obj/item/stack/sheet/iron
-	///How much of the buildstacktype is needed to construct the toilet.
+	/// How much of the buildstacktype is needed to construct the toilet.
 	var/buildstackamount = 1
-	///Lazylist of items in the cistern.
+	/// Lazylist of items in the cistern.
 	var/list/cistern_items
-	///Lazylist of fish in the toilet, not to be mixed with the items in the cistern. Max of 3
+	/// Lazylist of fish in the toilet, not to be mixed with the items in the cistern. Max of 3
 	var/list/fishes
+	/// Does the toilet have a water recycler to recollect its water supply?
+	var/has_water_reclaimer = TRUE
+	/// Units of water to reclaim per second
+	var/reclaim_rate = 0.5
+	/// What reagent does the toilet flush with
+	var/reagent_id = /datum/reagent/water
+	/// How much reagent can the cistern contain
+	var/reagent_capacity = 200
+	/// Item stuck in the basin of the toilet
+	var/obj/item/stuck_item = null
 
-/obj/structure/toilet/Initialize(mapload)
+/obj/structure/toilet/Initialize(mapload, has_water_reclaimer = null)
 	. = ..()
 	cover_open = round(rand(0, 1))
+	if(!isnull(has_water_reclaimer))
+		src.has_water_reclaimer = has_water_reclaimer
 	update_appearance(UPDATE_ICON)
 	if(mapload && SSmapping.level_trait(z, ZTRAIT_STATION))
 		AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/toilet])
 	AddElement(/datum/element/fish_safe_storage)
 	register_context()
+	create_reagents(reagent_capacity)
+	if(src.has_water_reclaimer)
+		reagents.add_reagent(reagent_id, reagent_capacity)
+	AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE)
 
 /obj/structure/toilet/add_context(atom/source, list/context, obj/item/held_item, mob/user)
 	. = ..()
 	if(user.pulling && isliving(user.pulling))
 		context[SCREENTIP_CONTEXT_LMB] = "Give Swirlie"
-	else if(cover_open && istype(held_item, /obj/item/fish))
-		context[SCREENTIP_CONTEXT_LMB] = "Insert Fish"
-	else if(cover_open && LAZYLEN(fishes))
-		context[SCREENTIP_CONTEXT_LMB] = "Grab Fish"
+	if(cover_open)
+		if(isnull(held_item))
+			if(LAZYLEN(fishes))
+				context[SCREENTIP_CONTEXT_LMB] = "Grab Fish"
+		else if(istype(held_item, /obj/item/fish))
+			context[SCREENTIP_CONTEXT_LMB] = "Insert Fish"
+		else if(istype(held_item, /obj/item/plunger))
+			context[SCREENTIP_CONTEXT_LMB] = "Unclog"
+		else if(held_item.w_class <= WEIGHT_CLASS_SMALL)
+			context[SCREENTIP_CONTEXT_LMB] = "Insert Item"
 	else if(cistern_open)
 		if(isnull(held_item))
 			context[SCREENTIP_CONTEXT_LMB] = "Check Cistern"
+		else if(held_item.tool_behaviour == TOOL_SCREWDRIVER && has_water_reclaimer)
+			context[SCREENTIP_CONTEXT_LMB] = "Remove Reclaimer"
+		else if(istype(held_item, /obj/item/stock_parts/water_recycler) && !has_water_reclaimer)
+			context[SCREENTIP_CONTEXT_LMB] = "Install Reclaimer"
 		else
 			context[SCREENTIP_CONTEXT_LMB] = "Insert Item"
 	context[SCREENTIP_CONTEXT_RMB] = "Flush"
@@ -54,8 +80,14 @@
 
 /obj/structure/toilet/examine(mob/user)
 	. = ..()
-	if(cover_open && LAZYLEN(fishes))
-		. += span_notice("You can see fish in the toilet, you can probably take one out.")
+	if(cover_open)
+		if(LAZYLEN(fishes))
+			. += span_notice("You can see fish in the toilet, you can probably take one out.")
+		if(stuck_item)
+			. += span_notice("There seems to be something small in [src]'s bowl...")
+	if(cistern_open && has_water_reclaimer)
+		. += span_notice("A water recycler is installed. Its attached by a pair of screws.")
+		. += span_notice("Its display states: [reagents.total_volume]/[reagents.maximum_volume] liquids remaining.")
 
 /obj/structure/toilet/examine_more(mob/user)
 	. = ..()
@@ -66,6 +98,7 @@
 	. = ..()
 	QDEL_LAZYLIST(fishes)
 	QDEL_LAZYLIST(cistern_items)
+	QDEL_NULL(stuck_item)
 
 /obj/structure/toilet/Exited(atom/movable/gone, direction)
 	. = ..()
@@ -101,12 +134,18 @@
 		if(swirlie)
 			return
 		if(cover_open)
+			if(!reagents.total_volume)
+				to_chat(user, span_notice("\The [src] is dry!"))
+				return
 			grabbed_mob.visible_message(span_danger("[user] starts to give [grabbed_mob] a swirlie!"), span_userdanger("[user] starts to give you a swirlie..."))
 			swirlie = grabbed_mob
 			var/was_alive = (swirlie.stat != DEAD)
 			if(!do_after(user, 3 SECONDS, target = src, timed_action_flags = IGNORE_HELD_ITEM))
 				swirlie = null
 				return
+			if(!reagents.total_volume)
+				to_chat(user, span_notice("\The [src] is dry!"))
+				return
 			grabbed_mob.visible_message(span_danger("[user] gives [grabbed_mob] a swirlie!"), span_userdanger("[user] gives you a swirlie!"), span_hear("You hear a toilet flushing."))
 			if(iscarbon(grabbed_mob))
 				var/mob/living/carbon/carbon_grabbed = grabbed_mob
@@ -158,7 +197,25 @@
 	. = ..()
 	if(flushing)
 		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+	if(reagents.total_volume <= 50)
+		to_chat(user, span_notice("You press the flush lever, but nothing happens."))
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
 	flushing = TRUE
+	var/something_stuck = !isnull(stuck_item)
+	if(!something_stuck && LAZYLEN(fishes))
+		for(var/obj/item/fish/fish as anything in fishes)
+			if(fish.w_class >= WEIGHT_CLASS_NORMAL)
+				something_stuck = TRUE
+				break
+
+	if(something_stuck)
+		reagents.create_foam(/datum/effect_system/fluid_spread/foam, 10, notification = span_danger("[src] overflows, spilling its cistern's contents everywhere!"), log = TRUE)
+	else
+		reagents.remove_all(50)
+
+	begin_reclamation()
 	playsound(src, 'sound/machines/toilet_flush.ogg', cover_open ? 40 : 20, TRUE)
 	if(cover_open && (dir & SOUTH))
 		update_appearance(UPDATE_OVERLAYS)
@@ -183,50 +240,97 @@
 	else
 		for(var/datum/material/M as anything in custom_materials)
 			new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1))
+	if(has_water_reclaimer)
+		new /obj/item/stock_parts/water_recycler(drop_location())
+	if(stuck_item)
+		stuck_item.forceMove(drop_location())
+
+/obj/structure/toilet/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+	if(user.combat_mode)
+		return NONE
 
-/obj/structure/toilet/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
 	add_fingerprint(user)
-	if(cover_open && istype(attacking_item, /obj/item/fish))
+	if(cover_open && istype(tool, /obj/item/fish))
 		if(fishes >= 3)
 			to_chat(user, span_warning("There's too many fishes, flush them down first."))
-			return
-		if(!user.transferItemToLoc(attacking_item, src))
-			to_chat(user, span_warning("\The [attacking_item] is stuck to your hand!"))
-			return
-		var/obj/item/fish/the_fish = attacking_item
+			return ITEM_INTERACT_BLOCKING
+		if(!user.transferItemToLoc(tool, src))
+			to_chat(user, span_warning("\The [tool] is stuck to your hand!"))
+			return ITEM_INTERACT_BLOCKING
+		var/obj/item/fish/the_fish = tool
 		if(the_fish.status == FISH_DEAD)
-			to_chat(user, span_warning("You place [attacking_item] into [src], may it rest in peace."))
+			to_chat(user, span_warning("You place [tool] into [src], may it rest in peace."))
 		else
-			to_chat(user, span_notice("You place [attacking_item] into [src], hopefully no one will miss it!"))
-		LAZYADD(fishes, attacking_item)
-		return
+			to_chat(user, span_notice("You place [tool] into [src], hopefully no one will miss it!"))
+		LAZYADD(fishes, tool)
+		return ITEM_INTERACT_SUCCESS
 
-	if(cistern_open && !user.combat_mode)
-		if(attacking_item.w_class > WEIGHT_CLASS_NORMAL)
-			to_chat(user, span_warning("[attacking_item] does not fit!"))
-			return
-		if(w_items + attacking_item.w_class > WEIGHT_CLASS_HUGE)
+	if(cistern_open)
+		if(istype(tool, /obj/item/stock_parts/water_recycler))
+			if(has_water_reclaimer)
+				to_chat(user, span_warning("[src] already has a water recycler installed."))
+				return ITEM_INTERACT_BLOCKING
+
+			playsound(src, 'sound/machines/click.ogg', 20, TRUE)
+			qdel(tool)
+			has_water_reclaimer = TRUE
+			begin_reclamation()
+			return ITEM_INTERACT_SUCCESS
+
+		if(tool.w_class > WEIGHT_CLASS_NORMAL)
+			to_chat(user, span_warning("[tool] does not fit!"))
+			return ITEM_INTERACT_BLOCKING
+		if(w_items + tool.w_class > WEIGHT_CLASS_HUGE)
 			to_chat(user, span_warning("The cistern is full!"))
-			return
-		if(!user.transferItemToLoc(attacking_item, src))
-			to_chat(user, span_warning("\The [attacking_item] is stuck to your hand, you cannot put it in the cistern!"))
-			return
-		LAZYADD(cistern_items, attacking_item)
-		w_items += attacking_item.w_class
-		to_chat(user, span_notice("You carefully place [attacking_item] into the cistern."))
-		return
+			return ITEM_INTERACT_BLOCKING
+		if(!user.transferItemToLoc(tool, src))
+			to_chat(user, span_warning("\The [tool] is stuck to your hand, you cannot put it in the cistern!"))
+			return ITEM_INTERACT_BLOCKING
+		LAZYADD(cistern_items, tool)
+		w_items += tool.w_class
+		to_chat(user, span_notice("You carefully place [tool] into the cistern."))
+		return ITEM_INTERACT_SUCCESS
 
-	if(is_reagent_container(attacking_item) && !user.combat_mode)
-		if (!cover_open)
-			return
-		if(istype(attacking_item, /obj/item/food/monkeycube))
-			var/obj/item/food/monkeycube/cube = attacking_item
-			cube.Expand()
-			return
-		var/obj/item/reagent_containers/RG = attacking_item
-		RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
-		to_chat(user, span_notice("You fill [RG] from [src]. Gross."))
-	return ..()
+	if(!cover_open)
+		return NONE
+
+	if(!is_reagent_container(tool))
+		if(tool.w_class > WEIGHT_CLASS_SMALL)
+			return NONE
+
+		if(stuck_item)
+			to_chat(user, span_warning("There's already something blocking [src]'s drain pipe!"))
+			return ITEM_INTERACT_BLOCKING
+
+		if(!user.transferItemToLoc(tool, src))
+			to_chat(user, span_warning("\The [tool] is stuck to your hand!"))
+			return ITEM_INTERACT_BLOCKING
+
+		stuck_item = tool
+		to_chat(user, span_notice("You drop [tool] into [src]'s bowl."))
+		return ITEM_INTERACT_SUCCESS
+
+	if(reagents.total_volume <= 0)
+		to_chat(user, span_notice("\The [src] is dry."))
+		return ITEM_INTERACT_BLOCKING
+
+	if(istype(tool, /obj/item/food/monkeycube))
+		var/obj/item/food/monkeycube/cube = tool
+		cube.Expand()
+		return ITEM_INTERACT_SUCCESS
+
+	var/obj/item/reagent_containers/container = tool
+	if(!container.is_refillable())
+		return NONE
+
+	if(container.reagents.holder_full())
+		to_chat(user, span_notice("\The [container] is full."))
+		return ITEM_INTERACT_BLOCKING
+
+	reagents.trans_to(container, container.amount_per_transfer_from_this, transferred_by = user)
+	begin_reclamation()
+	to_chat(user, span_notice("You fill [container] from [src]. Gross."))
+	return ITEM_INTERACT_SUCCESS
 
 /obj/structure/toilet/crowbar_act(mob/living/user, obj/item/tool)
 	to_chat(user, span_notice("You start to [cistern_open ? "replace the lid on" : "lift the lid off"] the cistern..."))
@@ -240,11 +344,39 @@
 		update_appearance(UPDATE_ICON_STATE)
 	return ITEM_INTERACT_SUCCESS
 
+/obj/structure/toilet/screwdriver_act(mob/living/user, obj/item/tool)
+	if(!cistern_open)
+		to_chat(user, span_warning("You need to open [src]'s cistern first!"))
+		return ITEM_INTERACT_BLOCKING
+
+	if(!has_water_reclaimer)
+		to_chat(user, span_warning("\the [src] doesn't have a water reclaimer installed."))
+		return ITEM_INTERACT_BLOCKING
+
+	tool.play_tool_sound(src)
+	has_water_reclaimer = FALSE
+	new /obj/item/stock_parts/water_recycler(drop_location())
+	to_chat(user, span_notice("You remove the water reclaimer from \the [src]."))
+	return ITEM_INTERACT_SUCCESS
+
 /obj/structure/toilet/wrench_act(mob/living/user, obj/item/tool)
 	tool.play_tool_sound(src)
 	deconstruct()
 	return ITEM_INTERACT_SUCCESS
 
+/obj/structure/toilet/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
+	user.balloon_alert_to_viewers("furiously plunging...")
+	if(!do_after(user, 3 SECONDS, target = src))
+		return TRUE
+	user.balloon_alert_to_viewers("finished plunging")
+	reagents.expose(get_turf(src), TOUCH) //splash on the floor
+	reagents.clear_reagents()
+	begin_reclamation()
+	if(stuck_item)
+		stuck_item.forceMove(drop_location())
+		stuck_item = null
+	return TRUE
+
 ///Ends the flushing animation and updates overlays if necessary
 /obj/structure/toilet/proc/end_flushing()
 	flushing = FALSE
@@ -252,9 +384,19 @@
 		update_appearance(UPDATE_OVERLAYS)
 	QDEL_LAZYLIST(fishes)
 
+/obj/structure/toilet/proc/begin_reclamation()
+	START_PROCESSING(SSplumbing, src)
+
+/obj/structure/toilet/process(seconds_per_tick)
+	// Water reclamation complete?
+	if(!has_water_reclaimer || reagents.total_volume >= reagents.maximum_volume)
+		return PROCESS_KILL
+	reagents.add_reagent(reagent_id, reclaim_rate * seconds_per_tick)
+
 /obj/structure/toilet/greyscale
 	material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
 	buildstacktype = null
+	has_water_reclaimer = FALSE
 
 /obj/structure/toilet/secret
 	var/secret_type = null

code/game/objects/structures/water_structures/water_source.dm

@@ -94,12 +94,6 @@
 		playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
 		return
 
-	if(istype(attacking_item, /obj/item/stack/ore/glass))
-		new /obj/item/stack/sheet/sandblock(loc)
-		to_chat(user, span_notice("You wet the sand and form it into a block."))
-		attacking_item.use(1)
-		return
-
 	if(!user.combat_mode || (attacking_item.item_flags & NOBLUDGEON))
 		to_chat(user, span_notice("You start washing [attacking_item]..."))
 		busy = TRUE