Fixes the tat gun

code/modules/customitems/item_defines.dm

@@ -11,8 +11,8 @@
 //////////////////////////////////
 
 /obj/item/device/fluff/tattoo_gun // Generic tattoo gun, make subtypes for different folks
-	name = "dispoable tattoo gun"
-	desc = "A cheap plastic tattoo application gun."
+	name = "dispoable tattoo pen"
+	desc = "A cheap plastic tattoo application pen."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "tatgun"
 	force = 0
@@ -20,7 +20,7 @@
 	w_class = 1.0
 	var/used = 0
 	var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
-	var/tattoo_icon = "markings_tiger" // body_accessory.dmi
+	var/tattoo_icon = "Tiger Body" // body_accessory.dmi, new icons defined in sprite_accessories.dm
 	var/tattoo_r = 1 // RGB values for the body markings
 	var/tattoo_g = 1
 	var/tattoo_b = 1
@@ -33,6 +33,7 @@
 
 	if(used)
 		user << "<span class= 'notice'>The [src] is out of ink.</span>"
+		return
 
 	if(!istype(M, /mob/living/carbon/human))
 		user << "<span class= 'notice'>You don't think tattooing [M] is the best idea.</span>"
@@ -44,7 +45,7 @@
 		user << "<span class= 'notice'>[target] has no skin, how do you expect to tattoo them?</span>"
 		return
 
-	if(target.m_style)
+	if(target.m_style != "None")
 		user << "<span class= 'notice'>[target] already has body markings, any more would look silly!</span>"
 		return
 
@@ -63,8 +64,9 @@
 		target.g_markings = tattoo_g
 		target.b_markings = tattoo_b
 
-		target.update_icons()
+		target.update_markings()
 
+		playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
 		icon_state = "tatgun_used"
 		used = 1
 
@@ -430,7 +432,7 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "elliot_windbreaker"
 	item_state = "elliot_windbreaker"
-	adjust_flavour = "zip"
+	adjust_flavour = "unzip"
 
 /obj/item/clothing/ears/earring/fluff/industrial_piercing
 	name = "industrial piercing and stud earring"
@@ -439,8 +441,9 @@
 	icon_state = "elliot_earring"
 
 /obj/item/device/fluff/tattoo_gun/cybernetic_tat
+	desc = "A cheap plastic tattoo application pen.<br>This one seems to have light blue ink."
 	tattoo_name = "circuitry tattoo"
-	tattoo_icon = "campbell_tattoo"
+	tattoo_icon = "Elliot Circuit Tattoo"
 	tattoo_r = 100
 	tattoo_g = 150
 	tattoo_b = 255

code/modules/mob/living/carbon/human/update_icons.dm

@@ -389,14 +389,13 @@ var/global/list/damage_icon_parts = list()
 	//base icons
 	var/icon/markings_standing	= new /icon('icons/mob/body_accessory.dmi',"accessory_none_s")
 
-	if(m_style && (src.species.bodyflags & HAS_MARKINGS))
+	if(m_style && m_style != "None")
 		var/datum/sprite_accessory/marking_style = marking_styles_list[m_style]
-		if(marking_style && marking_style.species_allowed)
-			if(src.species.name in marking_style.species_allowed)
-				var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
-				if(marking_style.do_colouration)
-					markings_s.Blend(rgb(r_markings, g_markings, b_markings), ICON_ADD)
-				markings_standing.Blend(markings_s, ICON_OVERLAY)
+		if(marking_style)
+			var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
+			if(marking_style.do_colouration)
+				markings_s.Blend(rgb(r_markings, g_markings, b_markings), ICON_ADD)
+			markings_standing.Blend(markings_s, ICON_OVERLAY)
 		else
 			//warning("Invalid m_style for [species.name]: [m_style]")
 

code/modules/mob/new_player/sprite_accessories.dm

@@ -1809,4 +1809,13 @@
 /datum/sprite_accessory/body_markings/tigerheadface_una
 	name = "Unathi Tiger Body + Head + Face"
 	species_allowed = list("Unathi")
-	icon_state = "markings_tigerheadface_una"
+	icon_state = "markings_tigerheadface_una"
+
+/datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm
+	name = "base tattoo"
+	species_allowed = list()
+	icon_state = "accessory_none"
+
+/datum/sprite_accessory/body_markings/tattoo/elliot
+	name = "Elliot Circuit Tattoo"
+	icon_state = "campbell_tattoo"