diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 856106ba48f..0c3c59595b2 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -178,19 +178,20 @@ BLIND // can't see anything /obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/wirecutters)) - if(clipped == 0) + if(!clipped) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("\red [user] snips the fingertips off [src].","\red You snip the fingertips off [src].") + user.visible_message("[user] snips the fingertips off [src].","You snip the fingertips off [src].") clipped = 1 + name = "mangled [name]" + desc = "[desc] They have had the fingertips cut off of them." if("exclude" in species_restricted) - name = "mangled [name]" - desc = "[desc] They have had the fingertips cut off of them." species_restricted -= "Unathi" species_restricted -= "Tajaran" - else if(clipped == 1) - user << "[src] have already been clipped!" update_icon() + else + user << "[src] have already been clipped!" return + else ..() /obj/item/clothing/gloves/proc/Touch() @@ -317,6 +318,8 @@ BLIND // can't see anything desc = "Comfortable-looking shoes." gender = PLURAL //Carn: for grammarically correct text-parsing var/chained = 0 + var/can_cut_open = 0 + var/cut_open = 0 body_parts_covered = FEET slot_flags = SLOT_FEET @@ -333,16 +336,36 @@ BLIND // can't see anything /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/match) && src.loc == user) var/obj/item/weapon/match/M = I - if(M.lit == 0) + if(!M.lit) // Match isn't lit, but isn't burnt. M.lit = 1 M.icon_state = "match_lit" processing_objects.Add(M) M.update_icon() - user << "You strike the [M] along your [src] to light it." - else if(M.lit == 1) + user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike the [M] on the bottom of [src] to light it.") + else if(M.lit == 1) // Match is lit, not extinguished. M.dropped() - user << "You crush the [M] into the bottom of your [src], extinguishing it." + user.visible_message("[user] crushes the [M] into the bottom of [src]. extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.") + else // Match has been previously lit and extinguished. + user << "The [M] has already been extinguished." return + + if(istype(I, /obj/item/weapon/wirecutters)) + if(can_cut_open) + if(!cut_open) + playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + user.visible_message("[user] cuts open the toes of [src].","You cut open the toes of [src].") + cut_open = 1 + icon_state = "[icon_state]_opentoe" + item_state = "[item_state]_opentoe" + name = "mangled [name]" + desc = "[desc] They have had their toes opened up." + if("exclude" in species_restricted) + species_restricted -= "Unathi" + species_restricted -= "Tajaran" + update_icon() + else + user << "[src] have already had their toes cut open!" + return else ..() diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 3200c0edcad..9f334a658f8 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -93,6 +93,7 @@ /obj/item/clothing/shoes/jackboots name = "jackboots" desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." + can_cut_open = 1 icon_state = "jackboots" item_state = "jackboots" item_color = "hosred" diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index b9cccb43949..e13cab2b876 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index cab7cc16e7c..56a2195ad69 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ