Merge pull request #7036 from FlattestGuitar/desolate-fluff

Adds a fluff item for DesolateG 👌

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

@@ -2,6 +2,7 @@
 	name = "stunbaton"
 	desc = "A stun baton for incapacitating people with."
 	icon_state = "stunbaton"
+	var/base_icon = "stunbaton"
 	item_state = "baton"
 	slot_flags = SLOT_BELT
 	force = 10
@@ -46,11 +47,11 @@
 
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
-		icon_state = "[initial(name)]_active"
+		icon_state = "[base_icon]_active"
 	else if(!bcell)
-		icon_state = "[initial(name)]_nocell"
+		icon_state = "[base_icon]_nocell"
 	else
-		icon_state = "[initial(name)]"
+		icon_state = "[base_icon]"
 
 /obj/item/weapon/melee/baton/examine(mob/user)
 	..(user)
@@ -187,6 +188,7 @@
 	name = "stunprod"
 	desc = "An improvised stun baton."
 	icon_state = "stunprod_nocell"
+	base_icon = "stunprod"
 	item_state = "prod"
 	w_class = 3
 	force = 3

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

@@ -2,6 +2,7 @@
 	name = "teleprod"
 	desc = "A prod with a bluespace crystal on the end. The crystal doesn't look too fun to touch."
 	icon_state = "teleprod_nocell"
+	base_icon = "teleprod"
 	item_state = "teleprod"
 	origin_tech = "combat=2;bluespace=4;materials=3"
 
@@ -15,4 +16,4 @@
 			deductcharge(hitcost)
 			do_teleport(user, get_turf(user), 50)//honk honk
 		else if(iscarbon(M) && !M.anchored)
-			do_teleport(M, get_turf(M), 15)
+			do_teleport(M, get_turf(M), 15)