Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-06-03 12:31:48 +01:00
68 changed files with 1990 additions and 435 deletions
+1 -1
View File
@@ -318,13 +318,13 @@
name = "mining drill brace"
desc = "A machinery brace for an industrial drill. It looks easily two feet thick."
icon_state = "mining_brace"
circuit = /obj/item/weapon/circuitboard/miningdrillbrace
var/obj/machinery/mining/drill/connected
/obj/machinery/mining/brace/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/miningdrillbrace(src)
/obj/machinery/mining/brace/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(connected && connected.active)