Skip to content

Commit

Permalink
Updates world icons for knives (#3663)
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


![image](https://github.com/user-attachments/assets/41a6de91-6054-41c5-9db7-09551d681209)

## Changelog

:cl:
imageadd: Updated world icons for knives
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Oct 28, 2024
1 parent e600422 commit 1d7ab90
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions code/game/objects/items/melee/knife.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/obj/item/melee/knife
icon_state = "kitchenknife"
item_state = "kitchenknife"
icon = 'icons/obj/weapon/knife.dmi'
icon = 'icons/obj/weapon/knives/knife.dmi'
world_file = 'icons/obj/weapon/knives/knife_world.dmi'
lefthand_file = 'icons/mob/inhands/weapons/knifes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/knifes_righthand.dmi'
pickup_sound = 'sound/items/handling/knife1_pickup.ogg'
Expand Down Expand Up @@ -105,7 +106,6 @@
force = 20
throwforce = 20
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
world_file = 'icons/obj/world/melee.dmi'

/obj/item/melee/knife/survival
name = "survival knife"
Expand All @@ -116,7 +116,6 @@
force = 15
throwforce = 15
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
world_file = 'icons/obj/world/melee.dmi'

/obj/item/melee/knife/bone
name = "bone dagger"
Expand All @@ -129,7 +128,6 @@
force = 15
throwforce = 15
custom_materials = null
world_file = 'icons/obj/world/melee.dmi'

/obj/item/melee/knife/combat/cyborg
name = "cyborg knife"
Expand Down
Binary file removed icons/obj/weapon/knife.dmi
Binary file not shown.
Binary file added icons/obj/weapon/knives/knife.dmi
Binary file not shown.
Binary file added icons/obj/weapon/knives/knife_world.dmi
Binary file not shown.
Binary file removed icons/obj/world/melee.dmi
Binary file not shown.

0 comments on commit 1d7ab90

Please sign in to comment.