diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 04b0d889e18..5c192beba09 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -10,6 +10,64 @@ ////////// Usable Items ////////// ////////////////////////////////// +/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." + icon = 'icons/obj/custom_items.dmi' + icon_state = "tatgun" + force = 0 + throwforce = 0 + 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_r = 1 // RGB values for the body markings + var/tattoo_g = 1 + var/tattoo_b = 1 + +/obj/item/device/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob) + if(user.a_intent == "harm") + user.visible_message("[user] stabs [M] with the [src]!", "You stab [M] with the [src]!") + M << "[user] stabs you with the [src]!
You feel a tiny prick!" + return + + if(used) + user << "The [src] is out of ink." + + if(!istype(M, /mob/living/carbon/human)) + user << "You don't think tattooing [M] is the best idea." + return + + var/mob/living/carbon/human/target = M + + if(istype(target.species, /datum/species/machine)) + user << "[target] has no skin, how do you expect to tattoo them?" + return + + if(target.m_style) + user << "[target] already has body markings, any more would look silly!" + return + + if(target == user) + user << "You use the [src] to apply a [tattoo_name] to yourself!" + + else + user.visible_message("[user] begins to apply a [tattoo_name] [target] with the [src].", "You begin to tattoo [target] with the [src]!") + if(!do_after(user,30, target = M)) + return + user.visible_message("[user] finishes the [tattoo_name] on [target].", "You finish the [tattoo_name].") + + if(!used) // No exploiting do_after to tattoo multiple folks. + target.m_style = tattoo_icon + target.r_markings = tattoo_r + target.g_markings = tattoo_g + target.b_markings = tattoo_b + + target.update_icons() + + icon_state = "tatgun_used" + used = 1 + /obj/item/weapon/claymore/fluff // MrBarrelrolll: Maximus Greenwood name = "Greenwood's Blade" desc = "A replica claymore with strange markings scratched into the blade." @@ -367,4 +425,33 @@ name = "combat pants" desc = "Medium style tactical pants, for the fashion aware combat units out there." icon_state = "chaps" - item_color = "combat_pants" \ No newline at end of file + item_color = "combat_pants" + +/obj/item/clothing/suit/jacket/fluff/windbreaker // Anxipal: Kido Qasteth + name = "nylon windbreaker" + desc = "A cheap nylon windbreaker, according to the tag it was manufactured in New Chiba, Earth.
The color reminds you of a television tuned to a dead channel." + icon = 'icons/obj/custom_items.dmi' + icon_state = "elliot_windbreaker" + item_state = "elliot_windbreaker" + adjust_flavour = "zip" + +/obj/item/clothing/suit/jacket/fluff/windbreaker // DaveTheHeadcrab: Elliot Campbell + name = "nylon windbreaker" + desc = "A cheap nylon windbreaker, according to the tag it was manufactured in New Chiba, Earth.
The color reminds you of a television tuned to a dead channel." + icon = 'icons/obj/custom_items.dmi' + icon_state = "elliot_windbreaker" + item_state = "elliot_windbreaker" + adjust_flavour = "zip" + +/obj/item/clothing/ears/earring/fluff/industrial_piercing + name = "industrial piercing and stud earring" + desc = "A set of ear piercings containing an industrial rod and a small stud. They appear to be made out of some form of non-magnetic metal." + icon = 'icons/obj/custom_items.dmi' + icon_state = "elliot_earring" + +/obj/item/device/fluff/tattoo_gun/cybernetic_tat + tattoo_name = "circuitry tattoo" + tattoo_icon = "campbell_tattoo" + tattoo_r = 100 + tattoo_g = 150 + tattoo_b = 255 \ No newline at end of file diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 92068cd07ac..1794a4782a3 100644 Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 58bfe9fb07e..0b7a5921355 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index 5c077de67c9..ffb0f2097f7 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ