diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index a0e3467ceb4..d941671ddb6 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -10,6 +10,7 @@ /obj/item/restraints breakouttime = 1 MINUTES dye_color = DYE_PRISONER + icon = 'icons/obj/restraints.dmi' /obj/item/restraints/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -26,7 +27,6 @@ name = "handcuffs" desc = "Use this to keep prisoners in line." gender = PLURAL - icon = 'icons/obj/items_and_weapons.dmi' icon_state = "handcuff" worn_icon_state = "handcuff" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' @@ -154,7 +154,6 @@ /obj/item/restraints/handcuffs/cable/sinew name = "sinew restraints" desc = "A pair of restraints fashioned from long strands of flesh." - icon = 'icons/obj/mining.dmi' icon_state = "sinewcuff" inhand_icon_state = "sinewcuff" custom_materials = null @@ -276,7 +275,6 @@ name = "leg cuffs" desc = "Use this to keep prisoners in line." gender = PLURAL - icon = 'icons/obj/items_and_weapons.dmi' icon_state = "handcuff" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm index 079a1dcd802..5075b22891c 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm @@ -69,6 +69,5 @@ desc = "Used by mega arachnids to immobilize their prey." item_flags = DROPDEL flags_1 = NONE + icon_state = "flesh_snare" armed = TRUE - icon_state = "tentacle_end" - icon = 'icons/obj/guns/projectiles.dmi' diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index a19e15b20df..56a6a8a4707 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 868f57743b8..3790698b130 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/icons/obj/restraints.dmi b/icons/obj/restraints.dmi new file mode 100644 index 00000000000..7523e78bd2c Binary files /dev/null and b/icons/obj/restraints.dmi differ