arm augments

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

@@ -201,4 +201,37 @@
 	icon_state = "memorizer"
 	item_state = "nullrod"
 
+/obj/item/device/flash/armimplant
+	name = "photon projector"
+	desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocals fix the flashbulb if it ever burns out."
+	var/flashcd = 20
+	var/overheat = 0
+	var/obj/item/organ/internal/cyberimp/arm/flash/I = null
+
+/obj/item/device/flash/armimplant/Destroy()
+	I = null
+	return ..()
+
+/obj/item/device/flash/armimplant/burn_out()
+	if(I && I.owner)
+		to_chat(I.owner, "<span class='warning'>Your photon projector implant overheats and deactivates!</span>")
+		I.Retract()
+	overheat = FALSE
+	addtimer(src, "cooldown", flashcd * 2)
+
+/obj/item/device/flash/armimplant/try_use_flash(mob/user = null)
+	if(overheat)
+		if(I && I.owner)
+			to_chat(I.owner, "<span class='warning'>Your photon projector is running too hot to be used again so quickly!</span>")
+		return FALSE
+	overheat = TRUE
+	addtimer(src, "cooldown", flashcd)
+	playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
+	update_icon(1)
+	return TRUE
+
+/obj/item/device/flash/armimplant/proc/cooldown()
+	overheat = FALSE
+
+
 /obj/item/device/flash/synthetic //just a regular flash now

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

@@ -151,6 +151,13 @@
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
 
+/obj/item/weapon/kitchen/knife/combat/cyborg
+	name = "cyborg knife"
+	icon = 'icons/obj/items_cyborg.dmi'
+	icon_state = "knife"
+	desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable."
+	origin_tech = null
+
 /obj/item/weapon/kitchen/knife/carrotshiv
 	name = "carrot shiv"
 	icon_state = "carrotshiv"

code/game/objects/items/weapons/melee/energy.dm

@@ -200,26 +200,29 @@
 	name = "energy blade"
 	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
 	icon_state = "blade"
-	force = 30
-	sharp = 1
-	edge = 1
+	force = 30	//Normal attacks deal esword damage
+	hitsound = 'sound/weapons/blade1.ogg'
+	active = 1
 	throwforce = 1//Throwing or dropping the item deletes it.
 	throw_speed = 3
 	throw_range = 1
 	w_class = WEIGHT_CLASS_BULKY //So you can't hide it in your pocket or some such.
-	armour_penetration = 50
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/datum/effect/system/spark_spread/spark_system
+	sharp = 1
+	edge = 1
 
 //Most of the other special functions are handled in their own files. aka special snowflake code so kewl
 /obj/item/weapon/melee/energy/blade/New()
+	..()
 	spark_system = new /datum/effect/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
-/obj/item/weapon/melee/energy/blade/dropped()
-	..()
-	qdel(src)
-
 /obj/item/weapon/melee/energy/blade/attack_self(mob/user)
 	return
+
+/obj/item/weapon/melee/energy/blade/hardlight
+	name = "hardlight blade"
+	desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
+	icon_state = "lightblade"
+	item_state = "lightblade"