Reverts infinite showers (#7016)

* AAAAAAAA

* Update shower.dm

* Update shower.dm

* Update shower.dm

_maps/map_files/generic/CentCom_skyrat_z2.dmm

@@ -37,14 +37,14 @@
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafe)
 "aas" = (
-/obj/machinery/shower/infinite{
+/obj/machinery/shower{
 	dir = 4;
 	icon_state = "shower"
 	},
 /turf/open/floor/plastic,
 /area/centcom/interlink)
 "aaN" = (
-/obj/machinery/shower/infinite{
+/obj/machinery/shower{
 	dir = 8;
 	icon_state = "shower"
 	},
@@ -63,7 +63,7 @@
 /area/centcom/holding/cafe)
 "aaQ" = (
 /obj/structure/curtain,
-/obj/machinery/shower/infinite{
+/obj/machinery/shower{
 	dir = 1;
 	icon_state = "shower"
 	},

code/game/objects/structures/shower.dm

@@ -78,6 +78,13 @@
 	else
 		return ..()
 
+//SKYRAT EDIT ADDITION
+/obj/machinery/shower/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
+	if(do_after(user, 3 SECONDS, src))
+		reagents.remove_any(reagents.total_volume)
+		balloon_alert(user, "reservoir emptied")
+//SKYRAT EDIT END
+
 /obj/machinery/shower/multitool_act(mob/living/user, obj/item/I)
 	. = ..()
 	if(. || !can_toggle_refill)

modular_skyrat/master_files/code/game/objects/structures/shower.dm

@@ -1,21 +0,0 @@
-/obj/machinery/shower/infinite
-	desc = "The HS-453. Installed in the 2550s by the Nanotrasen Hygiene Division, now with 2561 chemical compliance!"
-	can_toggle_refill = FALSE
-	can_refill = FALSE
-
-/obj/machinery/shower/interact(mob/M)
-	if(reagents.total_volume < reagent_capacity)
-		reagents.add_reagent(reagent_id, reagent_capacity - reagents.total_volume) //it will always be full, even if it's drained somehow
-	..()
-
-/obj/machinery/shower/process(delta_time)
-	if(!on) //if through admin fuckery the on variable is changed or when interact is called
-		soundloop.stop()
-		handle_mist()
-		update_appearance()
-		return
-	wash_atom(loc)
-	for(var/am in loc)
-		var/atom/movable/movable_content = am
-		if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above
-			wash_atom(movable_content) // Reagent exposure is handled in wash_atom

tgstation.dme

@@ -3712,7 +3712,6 @@
 #include "modular_skyrat\master_files\code\game\objects\items\devices\radio\headset.dm"
 #include "modular_skyrat\master_files\code\game\objects\items\storage\boxes.dm"
 #include "modular_skyrat\master_files\code\game\objects\structures\sauna_oven.dm"
-#include "modular_skyrat\master_files\code\game\objects\structures\shower.dm"
 #include "modular_skyrat\master_files\code\game\objects\structures\tables_racks.dm"
 #include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm"
 #include "modular_skyrat\master_files\code\modules\admin\admin.dm"