cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Aronai Sieyes
2021-10-22 13:42:32 -04:00
parent a8b6476b8f
commit 1b4ebb66f3
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/tools/rag.dm
-9
View File
@@ -101,17 +101,8 @@
user.visible_message("[user] starts to wipe [A] with [src].")
update_name()
if(do_after(user,30))
<<<<<<< HEAD
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
=======
user.visible_message("[user] finishes wiping [A]!")
A.on_rag_wipe(src)
>>>>>>> aa25456fcb8... Merge pull request #8236 from Cerebulon/wipedown
/obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
if(isliving(target)) //Leaving this as isliving.