From 7a6e82ce4eab052626218a37465e6e562e93ac08 Mon Sep 17 00:00:00 2001 From: Acetrea Date: Wed, 15 Jan 2025 16:43:01 -0700 Subject: [PATCH] Kitchen Utensil Sprite Fix --- .../objects/items/weapons/material/kitchen.dm | 11 ++++ .../objects/items/weapons/material/knives.dm | 1 + .../Acetrea-kitchenutensilsinhands.yml | 58 +++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 html/changelogs/Acetrea-kitchenutensilsinhands.yml diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 0596541f0ee..27ee5b35249 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -89,11 +89,13 @@ name = "fork" desc = "It's a fork. Sure is pointy." icon_state = "fork" + item_state = "fork" sharp = TRUE surgerysound = 'sound/items/surgery/hemostat.ogg' /obj/item/material/kitchen/utensil/fork/plastic icon_state = "plastic_fork" + item_state = "fork" default_material = MATERIAL_PLASTIC use_material_name = TRUE applies_material_colour = TRUE @@ -102,9 +104,11 @@ name = "spork" desc = "It's a spork. It's much like a fork, but much blunter." icon_state = "spork" + item_state = "fork" /obj/item/material/kitchen/utensil/spork/plastic icon_state = "plastic_spork" + item_state = "fork" default_material = MATERIAL_PLASTIC use_material_name = TRUE applies_material_colour = TRUE @@ -113,9 +117,11 @@ name = "chopsticks" desc = "A pair of chopsticks. An extension of one's fingers, one might say." icon_state = "chopsticks" + item_state = "chopsticks" /obj/item/material/kitchen/utensil/fork/chopsticks/bamboo icon_state = "plastic_chopsticks" + item_state = "chopsticks" default_material = MATERIAL_BAMBOO use_material_name = TRUE applies_material_colour = TRUE @@ -124,11 +130,13 @@ name = "spoon" desc = "It's a spoon. You can see your own upside-down face in it." icon_state = "spoon" + item_state = "spoon" attack_verb = list("attacked", "poked") force_divisor = 0.1 //2 when wielded with weight 20 (steel) /obj/item/material/kitchen/utensil/spoon/plastic icon_state = "plastic_spoon" + item_state = "spoon" default_material = MATERIAL_PLASTIC use_material_name = TRUE applies_material_colour = TRUE @@ -140,6 +148,7 @@ name = "knife" desc = "A knife for eating with. Can cut through any food." icon_state = "knife" + item_state = "knife" force_divisor = 0.1 // 6 when wielded with hardness 60 (steel) scoop_food = FALSE sharp = TRUE @@ -165,6 +174,7 @@ /obj/item/material/kitchen/utensil/knife/plastic icon_state = "plastic_knife" + item_state = "knife" default_material = MATERIAL_PLASTIC use_material_name = TRUE applies_material_colour = TRUE @@ -177,6 +187,7 @@ name = "rolling pin" desc = "Used to knock out the Bartender." icon_state = "rolling_pin" + item_state = "rolling_pin" attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") default_material = "wood" force_divisor = 0.7 // 10 when wielded with weight 15 (wood) diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index d7138951f61..894c0b31962 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/kitchen.dmi' contained_sprite = TRUE icon_state = "knife" + item_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." obj_flags = OBJ_FLAG_CONDUCTABLE sharp = 1 diff --git a/html/changelogs/Acetrea-kitchenutensilsinhands.yml b/html/changelogs/Acetrea-kitchenutensilsinhands.yml new file mode 100644 index 00000000000..aa7d5f97096 --- /dev/null +++ b/html/changelogs/Acetrea-kitchenutensilsinhands.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Acetrea + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Gave kitchen utensils their proper in-hand sprites."