cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #122 from Skyrat-SS13/upstream-merge-52477

Browse Source 
[MIRROR] Cleanable cleanup
This commit is contained in:
Gandalf
2020-07-30 00:33:12 +01:00
committed by GitHub
parent 242f38df81 4532b51db0
commit 65895fa8e3
41 changed files with 303 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/shower.dm
+7 -3
View File
@@ -98,7 +98,9 @@
wash_atom(AM)
/obj/machinery/shower/proc/wash_atom(atom/A)
A.washed(src)
A.wash(CLEAN_RAD | CLEAN_TYPE_WEAK) // Clean radiation non-instantly
A.wash(CLEAN_WASH)
SEND_SIGNAL(A, COMSIG_ADD_MOOD_EVENT, "shower", /datum/mood_event/nice_shower)
reagents.expose(A, TOUCH, reaction_volume)
if(isliving(A))
@@ -107,8 +109,10 @@
/obj/machinery/shower/process()
if(on)
wash_atom(loc)
for(var/AM in loc)
wash_atom(AM)
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)
else
return PROCESS_KILL
code/game/objects/structures/watercloset.dm
+12 -13
View File
@@ -279,21 +279,20 @@
busy = FALSE
if(washing_face)
SEND_SIGNAL(user, COMSIG_COMPONENT_CLEAN_FACE_ACT, CLEAN_WASH)
user.drowsyness = max(user.drowsyness - rand(2,3), 0) //Washing your face wakes you up if you're falling asleep
else if(ishuman(user))
var/mob/living/carbon/human/human_user = user
if(!human_user.wash_hands(CLEAN_WASH))
to_chat(user, "<span class='warning'>Your hands are covered by something!</span>")
return
else
user.wash(CLEAN_WASH)
user.visible_message("<span class='notice'>[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src].</span>", \
"<span class='notice'>You wash your [washing_face ? "face" : "hands"] using [src].</span>")
if(washing_face)
SEND_SIGNAL(user, COMSIG_COMPONENT_CLEAN_FACE_ACT, CLEAN_STRENGTH_BLOOD)
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.lip_style = null //Washes off lipstick
H.lip_color = initial(H.lip_color)
H.regenerate_icons()
user.drowsyness = max(user.drowsyness - rand(2,3), 0) //Washing your face wakes you up if you're falling asleep
else
user.washed(src)
/obj/structure/sink/attackby(obj/item/O, mob/living/user, params)
if(busy)
to_chat(user, "<span class='warning'>Someone's already washing here!</span>")
@@ -357,7 +356,7 @@
busy = FALSE
return 1
busy = FALSE
O.washed(src)
O.wash(CLEAN_WASH)
O.acid_level = 0
create_reagents(5)
reagents.add_reagent(dispensedreagent, 5)