Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""

This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
parent 27a099c6bf
commit 4ccf40f775
207 changed files with 8589 additions and 3508 deletions
@@ -37,6 +37,9 @@
 	icon_state = "crowbar_clock"
 	toolspeed = 0.5

+/obj/item/crowbar/brass/family
+	toolspeed = 1
+
 /obj/item/crowbar/bronze
 	name = "bronze plated crowbar"
 	desc = "A bronze plated crowbar."
@@ -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."
@@ -69,6 +69,9 @@
 	random_color = FALSE
 	toolspeed = 0.5

+/obj/item/wirecutters/brass/family
+	toolspeed = 1
+
 /obj/item/wirecutters/bronze
 	name = "bronze plated wirecutters"
 	desc = "A pair of wirecutters plated with bronze."
@@ -40,6 +40,9 @@
 	icon_state = "wrench_clock"
 	toolspeed = 0.5

+/obj/item/wrench/brass/family
+	toolspeed = 1
+
 /obj/item/wrench/bronze
 	name = "bronze plated wrench"
 	desc = "A bronze plated wrench."