From d04533698b3c2a23806036330cd1b16ab5f48320 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 3 Jul 2019 13:18:28 -0300 Subject: [PATCH] Fixes two missing sprites (#6651) --- code/game/objects/items/toys.dm | 3 ++- code/game/objects/items/weapons/material/misc.dm | 1 + code/game/objects/items/weapons/mop.dm | 1 + code/modules/reagents/reagent_containers/spray.dm | 2 +- html/changelogs/alberyk-spritefix.yml | 8 ++++++++ 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberyk-spritefix.yml diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 3d5ec6e38cb..945695f2f24 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -338,6 +338,7 @@ /obj/item/toy/waterflower name = "water flower" desc = "A seemingly innocent sunflower...with a twist." + icon = 'icons/obj/toy.dmi' icon_state = "sunflower" item_state = "sunflower" drop_sound = 'sound/items/drop/herb.ogg' @@ -813,7 +814,7 @@ desc = "A farwa plush doll. It's soft and comforting, with extra grip!" icon_state = "farwaplushie" slot_flags = SLOT_HEAD - + /obj/item/toy/plushie/bear name = "bear plush" desc = "A bear plushie. You should hug it, quickly!" diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index a56b46f97b9..5f0751e661f 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -44,6 +44,7 @@ sharp = 1 edge = 1 desc = "A sharp, metal hook that sticks into things." + icon = 'icons/obj/kitchen.dmi' icon_state = "hook_knife" item_state = "hook_knife" diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 0b66efc613a..d1fcdf2a0e1 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -3,6 +3,7 @@ name = "mop" icon = 'icons/obj/janitor.dmi' icon_state = "mop" + item_state = "mop" force = 3.0 throwforce = 10.0 throw_speed = 5 diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 4c26c1759bd..bab17e6e227 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -173,7 +173,7 @@ /obj/item/weapon/reagent_containers/spray/waterflower name = "water flower" desc = "A seemingly innocent sunflower...with a twist." - icon = 'icons/obj/device.dmi' + icon = 'icons/obj/toy.dmi' icon_state = "sunflower" item_state = "sunflower" amount_per_transfer_from_this = 1 diff --git a/html/changelogs/alberyk-spritefix.yml b/html/changelogs/alberyk-spritefix.yml new file mode 100644 index 00000000000..5ed303f9cd3 --- /dev/null +++ b/html/changelogs/alberyk-spritefix.yml @@ -0,0 +1,8 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the flower water having the incorrect sprite" + - bugfix: "Fixed the meat hook having no sprite." + - bugfix: "Fixed mop in hand sprite missing when the mop was wet."