Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

code/game/objects/items/devices/debugger.dm

@@ -0,0 +1,45 @@
+/**
+ * Multitool -- A multitool is used for hacking electronic devices.
+ * TO-DO -- Using it as a power measurement tool for cables etc. Nannek.
+ *
+ */
+
+/obj/item/device/debugger
+	icon = 'icons/obj/hacktool.dmi'
+	name = "debugger"
+	desc = "Used to debug electronic equipment."
+	icon_state = "hacktool-g"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 5.0
+	w_class = 2.0
+	throwforce = 5.0
+	throw_range = 15
+	throw_speed = 3
+	desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
+	m_amt = 50
+	g_amt = 20
+	origin_tech = "magnets=1;engineering=1"
+	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
+
+/obj/item/device/debugger/is_used_on(obj/O, mob/user)
+	if(istype(O, /obj/machinery/power/apc))
+		var/obj/machinery/power/apc/A = O
+		if(A.emagged || A.malfhack)
+			user << "\red There is a software error with the device."
+		else
+			user << "\blue The device's software appears to be fine."
+		return 1
+	if(istype(O, /obj/machinery/door))
+		var/obj/machinery/door/D = O
+		if(D.operating == -1)
+			user << "\red There is a software error with the device."
+		else
+			user << "\blue The device's software appears to be fine."
+		return 1
+	else if(istype(O, /obj/machinery))
+		var/obj/machinery/A = O
+		if(A.emagged)
+			user << "\red There is a software error with the device."
+		else
+			user << "\blue The device's software appears to be fine."
+		return 1

code/game/objects/items/stacks/medical.dm

@@ -76,9 +76,9 @@
 
 	M.updatehealth()
 /obj/item/stack/medical/bruise_pack
-	name = "bruise pack"
-	singular_name = "bruise pack"
-	desc = "A pack designed to treat blunt-force trauma."
+	name = "roll of gauze"
+	singular_name = "gauze length"
+	desc = "Some sterile gauze to wrap around bloody stumps."
 	icon_state = "brutepack"
 	heal_brute = 60
 	origin_tech = "biotech=1"