From 4f7e006971cb0234f00dd2be4f4db77ee9f3afad Mon Sep 17 00:00:00 2001 From: Casey Date: Mon, 8 Nov 2021 04:28:07 -0500 Subject: [PATCH] fixes floor attackbys theoretically --- code/game/turfs/simulated/floor_attackby.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 1168f7a081..e4f5a67dbf 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -9,8 +9,17 @@ attack_tile(C, L) // Be on help intent if you want to decon something. return +<<<<<<< HEAD if(!(C.is_screwdriver() && flooring && (flooring.flags & TURF_REMOVE_SCREWDRIVER)) && try_graffiti(user, C)) return +======= + if(!(C.has_tool_quality(TOOL_SCREWDRIVER) && flooring && (flooring.flags & TURF_REMOVE_SCREWDRIVER))) + if(isliving(user)) + var/mob/living/L = user + if(L.a_intent == I_HELP) + if(try_graffiti(L, C)) // back by unpopular demand + return +>>>>>>> b6f4d72e1f... Merge pull request #11802 from Hatterhat/patch-2 // Multi-z roof building if(istype(C, /obj/item/stack/tile/roofing))