diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index a20ab92e79a..bf4a8fc334c 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -220,6 +220,7 @@ name = "roller bed" icon = 'icons/obj/rollerbed.dmi' icon_state = "standard_down" + item_state = "rollerbed" anchored = FALSE var/base_state = "standard" var/item_bedpath = /obj/item/roller @@ -414,7 +415,12 @@ name = "roller bed" desc = "A collapsed roller bed that can be carried around." icon = 'icons/obj/rollerbed.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi' + ) icon_state = "standard_folded" + item_state = "rollerbed" drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' center_of_mass = list("x" = 17,"y" = 7) diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index ef9697a298a..c410bc58927 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -4,6 +4,11 @@ name = "glass" desc = "Your standard drinking glass." icon_state = "glass_empty" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_food.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_food.dmi', + ) + item_state = "glass_empty" amount_per_transfer_from_this = 5 volume = 30 unacidable = TRUE //glass @@ -23,6 +28,7 @@ center_of_mass = R.glass_center_of_mass || list("x"=16, "y"=10) else icon_state = "glass_empty" + item_state = "glass_empty" name = "glass" desc = "Your standard drinking glass." center_of_mass = list("x"=16, "y"=10) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 17788f7e058..aa1dc0fc819 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5221,6 +5221,10 @@ desc_fluff = "V'krexi, while edible, hold no nutritional value, either for humans or Vaurca. The V'krexi meat was mostly neglected until human food-processing techniques were introduced to the Zo'ra Hive." icon = 'icons/obj/food.dmi' icon_state = "vkrexitaffy" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_food.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_food.dmi', + ) item_state = "vkrexi" icon_type = "vkrexi taffy" storage_type = "packaging" diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index 08c3b05125f..2b9128a0d21 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -3,6 +3,11 @@ desc = "A plain white coffee cup." icon = 'icons/obj/drink_glasses/coffecup.dmi' icon_state = "coffeecup" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_food.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_food.dmi', + ) + item_state = "coffeecup" volume = 30 var/fillsource = "coffeecup" diff --git a/html/changelogs/desven-morehandsprites.yml b/html/changelogs/desven-morehandsprites.yml new file mode 100644 index 00000000000..8801adf60bc --- /dev/null +++ b/html/changelogs/desven-morehandsprites.yml @@ -0,0 +1,6 @@ +author: Desven +delete-after: True +changes: + - rscadd: "Added hand sprites for Zo'ra soda, coffee cups and drinking glasses." + - rscadd: "Added hand sprites for the roller bed." + - bugfix: "Fixed the V'krexi Snax hand sprite not properly showing." diff --git a/icons/mob/items/lefthand_food.dmi b/icons/mob/items/lefthand_food.dmi index d2238701b7e..710ee3a5576 100644 Binary files a/icons/mob/items/lefthand_food.dmi and b/icons/mob/items/lefthand_food.dmi differ diff --git a/icons/mob/items/lefthand_medical.dmi b/icons/mob/items/lefthand_medical.dmi index c7a99a7281f..6a856ea4cdc 100644 Binary files a/icons/mob/items/lefthand_medical.dmi and b/icons/mob/items/lefthand_medical.dmi differ diff --git a/icons/mob/items/righthand_food.dmi b/icons/mob/items/righthand_food.dmi index b8543b0b4f6..2b5d43c44f1 100644 Binary files a/icons/mob/items/righthand_food.dmi and b/icons/mob/items/righthand_food.dmi differ diff --git a/icons/mob/items/righthand_medical.dmi b/icons/mob/items/righthand_medical.dmi index e0758bd40f0..d507d12c52e 100644 Binary files a/icons/mob/items/righthand_medical.dmi and b/icons/mob/items/righthand_medical.dmi differ