Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall

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

@@ -21,3 +21,13 @@
 	origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
 	var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
 	var/obj/machinery/clonepod/connecting //same for cryopod linkage
+	var/obj/machinery/connectable	//Used to connect machinery, currently only used by Xenobio2.
+	
+/obj/item/device/multitool/attack_self(mob/user)
+	var/clear = alert("Do you want to clear the buffers on the [src]?",, "Yes", "No",)
+	if(clear == "Yes")
+		buffer = null
+		connecting = null
+		connectable = null
+	else
+		..()

code/game/objects/items/weapons/grenades/emgrenade.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/grenade/empgrenade
-	name = "classic emp grenade"
+	name = "emp grenade"
 	icon_state = "emp"
 	item_state = "empgrenade"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
@@ -12,7 +12,7 @@
 
 /obj/item/weapon/grenade/empgrenade/low_yield
 	name = "low yield emp grenade"
-	desc = "A weaker variant of the classic emp grenade"
+	desc = "A weaker variant of the EMP grenade"
 	icon_state = "lyemp"
 	item_state = "lyempgrenade"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)

code/game/objects/items/weapons/stunbaton.dm

@@ -12,6 +12,7 @@
 	w_class = 3
 	origin_tech = list(TECH_COMBAT = 2)
 	attack_verb = list("beaten")
+	var/lightcolor = "#FF6A00"
 	var/stunforce = 0
 	var/agonyforce = 60
 	var/status = 0		//whether the thing is on or not
@@ -52,7 +53,7 @@
 		icon_state = "[initial(name)]"
 
 	if(icon_state == "[initial(name)]_active")
-		set_light(1.5, 1, "#FF6A00")
+		set_light(1.5, 1, lightcolor)
 	else
 		set_light(0)