Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-02-23 11:01:42 +08:00
parent 2be4c76add d1475285b3
commit 5304029dd9
223 changed files with 1145 additions and 605 deletions
@@ -98,7 +98,7 @@

 /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params)
 	add_fingerprint(user)
-	if(istype(I, /obj/item/crowbar))
+	if(I.tool_behaviour == TOOL_CROWBAR)
 		to_chat(user, "<span class='notice'>You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]...</span>")
 		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
 		if(I.use_tool(src, user, 30))