Skip to content

Commit

Permalink
Fixes the switchblade letter opener and machete becoming invisible (#…
Browse files Browse the repository at this point in the history
…3767)

<!-- 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

switchblade now uses on/off sprite & has no world icon because it doesnt
have a world icon
letter opener now doesn't use world icons because it's stored in a
completely seperate file and doesn't have one either

machete now doesn't try to change its sprite on wielding because it
doesnt need to do that and also doesn't have the required sprite

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: some weapons are now more visible than they weren't supposed to be
(which is none)
/: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
SomeguyManperson authored Nov 23, 2024
1 parent dd4cac7 commit 39005d1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/game/objects/items/melee/knife.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
icon_state = "switchblade"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
world_file = null
desc = "A sharp, concealable, spring-loaded knife."
flags_1 = CONDUCT_1
force = 3
Expand Down Expand Up @@ -190,6 +191,7 @@
/obj/item/melee/knife/letter_opener
name = "letter opener"
icon = 'icons/obj/items.dmi'
world_file = null
icon_state = "letter_opener"
desc = "A military combat utility survival knife."
embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/melee/sword.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

/obj/item/melee/sword/mass/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22, icon_wielded="[base_icon_state]1")
AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22)

/obj/item/melee/sword/katana
name = "katana"
Expand Down
Binary file modified icons/obj/weapon/knives/knife.dmi
Binary file not shown.

0 comments on commit 39005d1

Please sign in to comment.