Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-06-09 11:07:39 +03:00
parent 094a1b6f62 26ef2c6812
commit b6dc41b852
177 changed files with 249863 additions and 2481 deletions
@@ -40,9 +40,6 @@
 		return ..()
 	return ..()

-/obj/item/holo/esword/attack(target as mob, mob/user as mob)
-	..()
-
 /obj/item/holo/esword/Initialize()
 	. = ..()
 	saber_color = pick("red","blue","green","purple")