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

Merge pull request #1621 from Pear120/pear-janitor

Browse Source 
Soap, Rags, and Buckets
This commit is contained in:
Arokha Sieyes
2017-06-05 09:39:59 -04:00
committed by GitHub
parent a2c8216e35 7b65a8836f
commit 9a69d76256
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/tools/rag.dm
+5 -1
View File
@@ -102,6 +102,10 @@
if(do_after(user,30))
user.visible_message("\The [user] finishes wiping off the [A]!")
A.clean_blood()
if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) //VOREStation Edit - "Allows rags to clean dirt from turfs"
var/turf/T = get_turf(A)
if(T)
T.clean(src, user) //VOREStation Edit End
/obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
if(isliving(target))
@@ -132,7 +136,7 @@
if(!proximity)
return
if(istype(A, /obj/structure/reagent_dispensers))
if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets"
if(!reagents.get_free_space())
user << "<span class='warning'>\The [src] is already soaked.</span>"
return
code/modules/reagents/reagent_containers/glass.dm
+1 -1
View File
@@ -249,7 +249,7 @@
user.drop_from_inventory(src)
qdel(src)
return
else if(istype(D, /obj/item/weapon/mop))
else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets"
if(reagents.total_volume < 1)
user << "<span class='warning'>\The [src] is empty!</span>"
else