diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 38fce93eefb..d10073b53ff 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -480,6 +480,10 @@ desc = "Special mechanical module made to store, sort, and apply standard machine parts." icon_state = "RPED" item_state = "RPED" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_device.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_device.dmi' + ) w_class = 5 can_hold = list(/obj/item/stock_parts,/obj/item/reagent_containers/glass/beaker) storage_slots = 50 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7903491ddb7..ac5881fcee5 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -255,6 +255,10 @@ icon = 'icons/obj/weapons.dmi' icon_state = "sword0" item_state = "sword0" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/weapons/lefthand_energy.dmi', + slot_r_hand_str = 'icons/mob/items/weapons/righthand_energy.dmi', + ) drop_sound = 'sound/items/drop/gun.ogg' var/active = 0.0 var/colorvar = "blue" diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index 6a1b693269d..522f84f2075 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -5,6 +5,10 @@ icon = 'icons/obj/rfd.dmi' icon_state = "rfd" item_state = "rfd" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_tools.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_tools.dmi' + ) opacity = 0 density = 0 anchored = 0.0 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 2dbbe477741..3201f516a2a 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -123,6 +123,10 @@ name = "plant bag" icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "plantbag" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_hydro.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_hydro.dmi', + ) max_storage_space = 100 max_w_class = 3 w_class = 2 diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 0ae8b53ad36..593f0e4a0a7 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -3,6 +3,10 @@ desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" item_state = "briefcase" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/storage/lefthand_briefcase.dmi', + slot_r_hand_str = 'icons/mob/items/storage/righthand_briefcase.dmi' + ) flags = CONDUCT force = 8.0 throw_speed = 1 @@ -29,4 +33,4 @@ name = "\improper NT briefcase" desc = "The NanoTrasen-branded briefcase is an elegant, yet functional upgrade to the traditional black briefcase. The logo is the only difference, though." icon_state = "briefcase_corpnt" - item_state = "briefcase_corpnt" + item_state = "briefcase_corpnt" diff --git a/html/changelogs/wezzy_inhand_fixes_dorime.yml b/html/changelogs/wezzy_inhand_fixes_dorime.yml new file mode 100644 index 00000000000..b4ccefbea27 --- /dev/null +++ b/html/changelogs/wezzy_inhand_fixes_dorime.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes missing inhands for RFDs, RPED, toy sword, plant bag and briefcases."