diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 2732e0d37719..1475ae88f8dd 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -66,10 +66,13 @@ /obj/item/kitchen/knife name = "kitchen knife" - icon_state = "knife" - item_state = "knife" + icon = 'icons/obj/item/knife.dmi' + lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/knifes_righthand.dmi' + icon_state = "kitchenknife" + item_state = "kitchenknife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - pickup_sound = 'sound/items/handling/knife1_pickup.ogg' + pickup_sound = 'sound/items/handling/knife1_pickup.ogg' drop_sound = 'sound/items/handling/knife3_drop.ogg' flags_1 = CONDUCT_1 force = 10 @@ -97,7 +100,6 @@ /obj/item/kitchen/knife/plastic name = "plastic knife" icon_state = "plastic_knife" - item_state = "knife" desc = "A very safe, barely sharp knife made of plastic. Good for cutting food and not much else." force = 0 w_class = WEIGHT_CLASS_TINY @@ -155,8 +157,8 @@ /obj/item/kitchen/knife/butcher name = "butcher's cleaver" - icon_state = "butch" - item_state = "butch" + icon_state = "cleaver" + item_state = "cleaver" desc = "A huge thing used for chopping and chopping up meat." flags_1 = CONDUCT_1 force = 15 @@ -177,7 +179,8 @@ /obj/item/kitchen/knife/combat name = "combat knife" - icon_state = "buckknife" + icon_state = "combatknife" + item_state = "combatknife" desc = "A military combat utility survival knife." embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) force = 20 @@ -188,6 +191,7 @@ /obj/item/kitchen/knife/combat/survival name = "survival knife" icon_state = "survivalknife" + item_state = "survivalknife" embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10) desc = "A hunting grade survival knife." force = 15 diff --git a/icons/mob/inhands/equipment/kitchen_lefthand.dmi b/icons/mob/inhands/equipment/kitchen_lefthand.dmi index 3848a84d00c6..d60c9bf8f476 100644 Binary files a/icons/mob/inhands/equipment/kitchen_lefthand.dmi and b/icons/mob/inhands/equipment/kitchen_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/kitchen_righthand.dmi b/icons/mob/inhands/equipment/kitchen_righthand.dmi index 62330ebfef69..b0a0f6c475bd 100644 Binary files a/icons/mob/inhands/equipment/kitchen_righthand.dmi and b/icons/mob/inhands/equipment/kitchen_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/knifes_lefthand.dmi b/icons/mob/inhands/weapons/knifes_lefthand.dmi new file mode 100644 index 000000000000..01f5fd3185c9 Binary files /dev/null and b/icons/mob/inhands/weapons/knifes_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/knifes_righthand.dmi b/icons/mob/inhands/weapons/knifes_righthand.dmi new file mode 100644 index 000000000000..d9803bd40a6e Binary files /dev/null and b/icons/mob/inhands/weapons/knifes_righthand.dmi differ diff --git a/icons/obj/item/knife.dmi b/icons/obj/item/knife.dmi new file mode 100644 index 000000000000..aebfb617ed34 Binary files /dev/null and b/icons/obj/item/knife.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 90d6ca121193..5818b7a55d81 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ