cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4342 from 9600bauds/splishsplash

Browse Source 
Fixes sinks trying to fill containers past their maximum capacity (#4194)
This commit is contained in:
d3athrow
2015-05-09 20:04:28 -05:00
parent 0ea6c11698 ae225d3c55
commit 02ac722250
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -423,6 +423,9 @@
if (istype(O, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RG = O
if(RG.reagents.total_volume >= RG.reagents.maximum_volume)
user << "<span class='warning'>[RG] is full.</span>"
return
RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
user.visible_message("<span class='notice'>[user] fills the [RG] using \the [src].</span>","<span class='notice'>You fill the [RG] using \the [src].</span>")
return
@@ -440,8 +443,8 @@
else
B.deductcharge(1)
user.visible_message( \
"[user] was stunned by his wet [O].", \
"<span class='warning'>You have wet \the [O], it shocks you!</span>")
"<span class='warning'>[user] was stunned by \his wet [O.name]!</span>", \
"<span class='warning'>You have wet \the [O.name], it shocks you!</span>")
return
if (!isturf(user.loc))