cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #924 from Zuhayr/master

Browse Source 
Allowed pouring reagent containers down the sink.
This commit is contained in:
Neerti
2016-02-08 02:35:38 -05:00
parent c103bd1cf7 dad8d16136
commit 5a48bbc7c7
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/objects/structures/watercloset.dm
View File

@@ -345,6 +345,20 @@
anchored = 1 anchored = 1
var/busy = 0 //Something's being washed at the moment var/busy = 0 //Something's being washed at the moment
/obj/structure/sink/MouseDrop_T(var/obj/item/thing, var/mob/user)
..()
if(!istype(thing) || !thing.is_open_container())
return ..()
if(!usr.Adjacent(src))
return ..()
if(!thing.reagents || thing.reagents.total_volume == 0)
usr << "<span class='warning'>\The [thing] is empty.</span>"
return
// Clear the vessel.
visible_message("<span class='notice'>\The [usr] tips the contents of \the [thing] into \the [src].</span>")
thing.reagents.clear_reagents()
thing.update_icon()
/obj/structure/sink/attack_hand(mob/user as mob) /obj/structure/sink/attack_hand(mob/user as mob)
if (ishuman(user)) if (ishuman(user))
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
@@ -443,7 +457,6 @@
name = "kitchen sink" name = "kitchen sink"
icon_state = "sink_alt" icon_state = "sink_alt"
/obj/structure/sink/puddle //splishy splashy ^_^ /obj/structure/sink/puddle //splishy splashy ^_^
name = "puddle" name = "puddle"
icon_state = "puddle" icon_state = "puddle"