This commit is contained in:
TrilbySpaceClone
2020-04-04 09:30:24 -04:00
parent 70cd562b36
commit 10ca01cc95
2 changed files with 144 additions and 15 deletions
+6 -12
View File
@@ -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(.)
@@ -71,11 +69,9 @@
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>")
@@ -120,8 +116,14 @@
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"
@@ -194,7 +196,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 +279,6 @@
add_hiddenprint(user)
return TRUE
/obj/machinery/shower/update_overlays()
. = ..()
if(on)
@@ -315,7 +315,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 +324,6 @@
I.acid_level = 0
I.extinguish()
/obj/machinery/shower/proc/wash_turf()
if(isturf(loc))
var/turf/tile = loc
@@ -336,7 +334,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 +664,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 +722,6 @@
return TRUE
/obj/structure/curtain/attack_hand(mob/user)
. = ..()
if(.)