Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

This commit is contained in:
silicons
2020-10-10 22:23:22 -07:00
215 changed files with 7532 additions and 2391 deletions
@@ -89,6 +89,9 @@
toolspeed = 0.5
random_color = FALSE
/obj/item/screwdriver/brass/family
toolspeed = 1
/obj/item/screwdriver/bronze
name = "bronze screwdriver"
desc = "A screwdriver plated with bronze."