diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 3d496ca3b86..894f51fee69 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -1,35 +1,30 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /**********************************************************************
 						Cyborg Spec Items
 ***********************************************************************/
 //Might want to move this into several files later but for now it works here
 /obj/item/borg/stun
-	name = "Electrified Arm"
-	icon = 'icons/obj/decals.dmi'
-	icon_state = "shock"
+	name = "electrified arm"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "elecarm"
+	
+/obj/item/borg/stun/attack(mob/M, mob/living/silicon/robot/user)
+	user.cell.charge -= 30
 
-	attack(mob/M as mob, mob/living/silicon/robot/user as mob)
-		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [key_name(user)]</font>")
-		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [key_name(M)]</font>")
-		if(M.ckey)
-			msg_admin_attack("[key_name_admin(user)] used the [src.name] to attack [key_name_admin(M)]")
+	M.Weaken(5)
+	if (M.stuttering < 5)
+		M.stuttering = 5
+	M.Stun(5)
 
-		if(!iscarbon(user))
-			M.LAssailant = null
-		else
-			M.LAssailant = user
+	M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
+					  "<span class='userdanger'>[user] has prodded you with [src].</span>")
+	playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+	
+	if(!iscarbon(user))
+		M.LAssailant = null
+	else
+		M.LAssailant = user
 
-		user.cell.charge -= 30
-
-		M.Weaken(5)
-		if (M.stuttering < 5)
-			M.stuttering = 5
-		M.Stun(5)
-
-		for(var/mob/O in viewers(M, null))
-			if (O.client)
-				O.show_message("\red <B>[user] has prodded [M] with an electrically-charged arm!</B>", 1, "\red You hear someone fall", 2)
+	add_logs(M, user, "stunned", src, "(INTENT: [uppertext(user.a_intent)])")
 
 /obj/item/borg/overdrive
 	name = "Overdrive"
@@ -44,19 +39,16 @@
 	icon_state = "securearea"
 	var/sight_mode = null
 
-
 /obj/item/borg/sight/xray
 	name = "X-ray Vision"
 	sight_mode = BORGXRAY
 
-
 /obj/item/borg/sight/thermal
 	name = "Thermal Vision"
 	sight_mode = BORGTHERM
 	icon_state = "thermal"
 	icon = 'icons/obj/clothing/glasses.dmi'
 
-
 /obj/item/borg/sight/meson
 	name = "Meson Vision"
 	sight_mode = BORGMESON
@@ -67,24 +59,22 @@
 	name = "Hud"
 	var/obj/item/clothing/glasses/hud/hud = null
 
-
 /obj/item/borg/sight/hud/med
 	name = "medical hud"
 	icon_state = "healthhud"
 	icon = 'icons/obj/clothing/glasses.dmi'
 
-	New()
-		..()
-		hud = new /obj/item/clothing/glasses/hud/health(src)
-		return
-
+/obj/item/borg/sight/hud/med/New()
+	..()
+	hud = new /obj/item/clothing/glasses/hud/health(src)
+	return
 
 /obj/item/borg/sight/hud/sec
 	name = "security hud"
 	icon_state = "securityhud"
 	icon = 'icons/obj/clothing/glasses.dmi'
 
-	New()
-		..()
-		hud = new /obj/item/clothing/glasses/hud/security(src)
-		return
+/obj/item/borg/sight/hud/sec/New()
+	..()
+	hud = new /obj/item/clothing/glasses/hud/security(src)
+	return
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 826c5ea1f4f..dd6cf13fc1e 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ