Revert "effort"

This reverts commit 10ca01cc95.

code/game/objects/structures/watercloset.dm

@@ -12,11 +12,13 @@
 	var/w_items = 0			//the combined w_class of all the items in the cistern
 	var/mob/living/swirlie = null	//the mob being given a swirlie
 
+
 /obj/structure/toilet/Initialize()
 	. = ..()
 	open = round(rand(0, 1))
 	update_icon()
 
+
 /obj/structure/toilet/attack_hand(mob/living/user)
 	. = ..()
 	if(.)
@@ -69,9 +71,11 @@
 		open = !open
 		update_icon()
 
+
 /obj/structure/toilet/update_icon_state()
 	icon_state = "toilet[open][cistern]"
 
+
 /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/crowbar))
 		to_chat(user, "<span class='notice'>You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...</span>")
@@ -116,14 +120,8 @@
 		w_items += secret.w_class
 		contents += secret
 
-/obj/structure/toilet/secret/prison //We care about you Skyrats!
-	secret_type = /obj/effect/spawner/lootdrop/prison_loot_toilet
 
-/obj/structure/toilet/secret/low_loot
-	secret_type = /obj/effect/spawner/lootdrop/low_loot_toilet
 
-/obj/structure/toilet/secret/high_loot
-	secret_type = /obj/effect/spawner/lootdrop/high_loot_toilet
 
 /obj/structure/urinal
 	name = "urinal"
@@ -196,6 +194,7 @@
 		exposed = !exposed
 	return TRUE
 
+
 /obj/item/reagent_containers/food/urinalcake
 	name = "urinal cake"
 	desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat."
@@ -279,6 +278,7 @@
 		add_hiddenprint(user)
 	return TRUE
 
+
 /obj/machinery/shower/update_overlays()
 	. = ..()
 	if(on)
@@ -315,6 +315,7 @@
 		else if(isobj(AM))
 			wash_obj(AM)
 
+
 /obj/machinery/shower/proc/wash_obj(obj/O)
 	. = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
 	. = O.clean_blood()
@@ -324,6 +325,7 @@
 		I.acid_level = 0
 		I.extinguish()
 
+
 /obj/machinery/shower/proc/wash_turf()
 	if(isturf(loc))
 		var/turf/tile = loc
@@ -334,6 +336,7 @@
 			if(is_cleanable(E))
 				qdel(E)
 
+
 /obj/machinery/shower/proc/wash_mob(mob/living/L)
 	SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
 	L.wash_cream()
@@ -664,9 +667,11 @@
 /obj/structure/sink/puddle/deconstruct(disassembled = TRUE)
 	qdel(src)
 
+
 //Shower Curtains//
 //Defines used are pre-existing in layers.dm//
 
+
 /obj/structure/curtain
 	name = "curtain"
 	desc = "Contains less than 1% mercury."
@@ -722,6 +727,7 @@
 
 	return TRUE
 
+
 /obj/structure/curtain/attack_hand(mob/user)
 	. = ..()
 	if(.)