Skip to content

Commit

Permalink
re:knifes (#2933)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Repsprites most knifes in the games, at least the ones that matter. Done
on behalf of FleetingExpertise.
## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/cc85332f-520c-4b21-96bf-9a248c3b321e)

## Changelog

:cl: FleetingExpertise
add: Most knifes in the game have  been resprited!
/:cl:
  • Loading branch information
rye-rice authored May 15, 2024
1 parent e6c20d0 commit 871c6fc
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions code/game/objects/items/kitchen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Binary file modified icons/mob/inhands/equipment/kitchen_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/kitchen_righthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/weapons/knifes_lefthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/weapons/knifes_righthand.dmi
Binary file not shown.
Binary file added icons/obj/item/knife.dmi
Binary file not shown.
Binary file modified icons/obj/kitchen.dmi
Binary file not shown.

0 comments on commit 871c6fc

Please sign in to comment.