cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rags & ashtrays (#11610)

Browse Source
This commit is contained in:
Wildkins
2021-04-07 16:26:42 +02:00
committed by GitHub
parent f38f1342bb
commit 4933174d42
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/watercloset.dm
+1 -3
View File
@@ -459,8 +459,6 @@
// Filling/emptying open reagent containers
var/obj/item/reagent_containers/RG = O
if (istype(RG, /obj/item/reagent_containers/glass/rag))
return
if (istype(RG) && RG.is_open_container())
var/atype = alert(usr, "Do you want to fill or empty \the [RG] at \the [src]?", "Fill or Empty", "Fill", "Empty", "Cancel")
@@ -534,7 +532,7 @@
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
return
else if(istype(O, /obj/item/mop) || istype(O, /obj/item/reagent_containers/glass/rag))
else if(istype(O, /obj/item/mop))
O.reagents.add_reagent(/decl/reagent/water, 5)
to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src]."))
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)