More bug fixes (#6560)

* More esword fixes

- Fixes Holodeck eswords being completely broken, Holodeck eswords are not recolorable
- Fixes Toy sword onmob sprite not properly updating
- Fixes eswords not properly updating onmob color (this is an incredibly hacky fix)
- Readds the esword sub types, they are not recolorable

* Removes unintended code

* More unintended code removal

* Fixes spy bug sprite

* Fixes PMC-S Name

* Fixes syringes not working through voidsuits.

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

@@ -60,7 +60,7 @@
 	name = "broken bug"
 	desc = ""	//Even when it's broken it's inconspicuous
 	icon = 'icons/obj/weapons.dmi'
-	icon_state = "eshield0"
+	icon_state = "eshield"
 	item_state = "nothing"
 	layer = TURF_LAYER+0.2
 	w_class = ITEMSIZE_TINY
@@ -75,7 +75,7 @@
 	name = "bug"
 	desc = ""	//Nothing to see here
 	icon = 'icons/obj/weapons.dmi'
-	icon_state = "eshield0"
+	icon_state = "eshield"
 	item_state = "nothing"
 	layer = TURF_LAYER+0.2
 	w_class = ITEMSIZE_TINY

code/game/objects/items/toys.dm

@@ -271,10 +271,12 @@
 		if (src.active)
 			user << "<span class='notice'>You extend the plastic blade with a quick flick of your wrist.</span>"
 			playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
+			src.item_state = "[icon_state]_blade"
 			src.w_class = ITEMSIZE_LARGE
 		else
 			user << "<span class='notice'>You push the plastic blade back down into the handle.</span>"
 			playsound(user, 'sound/weapons/saberoff.ogg', 50, 1)
+			src.item_state = "[icon_state]"
 			src.w_class = ITEMSIZE_SMALL
 		update_icon()
 		src.add_fingerprint(user)

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

@@ -23,6 +23,26 @@
 			slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
 			)
 
+/obj/item/weapon/melee/energy/sword/green/New()
+	colorable = FALSE
+	lcolor = "#008000"
+
+/obj/item/weapon/melee/energy/sword/red/New()
+	colorable = FALSE
+	lcolor = "#FF0000"
+
+/obj/item/weapon/melee/energy/sword/blue/New()
+	colorable = FALSE
+	lcolor = "#0000FF"
+
+/obj/item/weapon/melee/energy/sword/purple/New()
+	colorable = FALSE
+	lcolor = "#800080"
+
+/obj/item/weapon/melee/energy/sword/white/New()
+	colorable = FALSE
+	lcolor = "#FFFFFF"
+
 /obj/item/weapon/melee/energy/proc/activate(mob/living/user)
 	if(active)
 		return
@@ -147,11 +167,12 @@
 /obj/item/weapon/melee/energy/update_icon()
 	. = ..()
 	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "[icon_state]_blade")
-	if(colorable)
-		blade_overlay.color = lcolor
-	if(rainbow || !colorable)
+	blade_overlay.color = lcolor
+	color = lcolor	
+	if(rainbow)
 		blade_overlay = mutable_appearance(icon, "[icon_state]_blade_rainbow")
 		blade_overlay.color = "FFFFFF"
+		color = "FFFFFF"
 	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
 	if(active)
 		add_overlay(blade_overlay)