diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 81034248ec..57721ee9ca 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -12,13 +12,11 @@ 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(.) @@ -120,6 +118,12 @@ w_items += secret.w_class contents += secret +/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/toilet/secret/prison secret_type = /obj/effect/spawner/lootdrop/prison_loot_toilet @@ -194,7 +198,6 @@ 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." @@ -278,7 +281,6 @@ add_hiddenprint(user) return TRUE - /obj/machinery/shower/update_overlays() . = ..() if(on) @@ -315,7 +317,6 @@ 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() @@ -325,7 +326,6 @@ I.acid_level = 0 I.extinguish() - /obj/machinery/shower/proc/wash_turf() if(isturf(loc)) var/turf/tile = loc @@ -336,7 +336,6 @@ 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() @@ -667,11 +666,9 @@ /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." @@ -727,7 +724,6 @@ return TRUE - /obj/structure/curtain/attack_hand(mob/user) . = ..() if(.)