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

You can make a damp rag out of medical gauze + other sink refactors (#24500)

Browse Source 
* adds gauze reaction, partially refactors sink water interactions

* Hey guys scarce here

Apparently it takes bandit more than 3 days to make one simple change

* Update watercloset.dm

asdf
This commit is contained in:
bgobandit
2017-03-02 19:48:44 +13:00
committed by oranges
parent c8e8cb40f7
commit 85621d1e5e
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/watercloset.dm
+12 -8
View File
@@ -406,6 +406,7 @@
desc = "A sink used for washing one's hands and face."
anchored = 1
var/busy = 0 //Something's being washed at the moment
var/dispensedreagent = "water" // for whenever plumbing happens
/obj/structure/sink/attack_hand(mob/living/user)
@@ -455,7 +456,7 @@
if(istype(O, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RG = O
if(RG.container_type & OPENCONTAINER)
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
RG.reagents.add_reagent("[dispensedreagent]", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user << "<span class='notice'>You fill [RG] from [src].</span>"
return 1
@@ -475,16 +476,16 @@
return
if(istype(O, /obj/item/weapon/mop))
O.reagents.add_reagent("water", 5)
O.reagents.add_reagent("[dispensedreagent]", 5)
user << "<span class='notice'>You wet [O] in [src].</span>"
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
return
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = O
user << "<span class='notice'>You place [O] under a stream of water...</span>"
user.drop_item()
M.loc = get_turf(src)
M.Expand()
if(istype(O, /obj/item/stack/medical/gauze))
var/obj/item/stack/medical/gauze/G = O
new /obj/item/weapon/reagent_containers/glass/rag(src.loc)
user << "<span class='notice'>You tear off a strip of gauze and make a rag.</span>"
G.use(1)
return
if(!istype(O))
@@ -501,6 +502,9 @@
busy = 0
O.clean_blood()
O.acid_level = 0
create_reagents(5)
reagents.add_reagent("[dispensedreagent]", 5)
reagents.reaction(O, TOUCH)
user.visible_message("<span class='notice'>[user] washes [O] using [src].</span>", \
"<span class='notice'>You wash [O] using [src].</span>")
return 1