diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index a9ebab8fa1486..9408d2360f9f2 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -6,6 +6,11 @@ desc = "Some empty sandbags, best to fill them up with an entrenching tool if you want to use them." singular_name = "sandbag" icon_state = "sandbag_stack" + item_state = "sandbag_stack" + item_icons = list( + slot_l_hand_str = 'icons/mob/inhands/items/stacks_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/stacks_right.dmi', + ) w_class = WEIGHT_CLASS_NORMAL force = 2 throw_speed = 5 @@ -61,6 +66,11 @@ desc = "Some bags filled with sand. For now, just cumbersome, but soon to be used for fortifications." singular_name = "sandbag" icon_state = "sandbag_pile" + item_state = "sandbag_pile" + item_icons = list( + slot_l_hand_str = 'icons/mob/inhands/items/stacks_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/items/stacks_right.dmi', + ) w_class = WEIGHT_CLASS_NORMAL force = 9 throwforce = 15 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 919535a5abe50..3dbd6282c5bbf 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -14,6 +14,7 @@ desc = "Glass is a non-crystalline solid, made out of silicate, the primary constituent of sand. It is valued for its transparency, albeit it is not too resistant to damage." singular_name = "glass sheet" icon_state = "sheet-glass" + item_state = "sheet-glass" merge_type = /obj/item/stack/sheet/glass var/created_window = /obj/structure/window var/reinforced_type = /obj/item/stack/sheet/glass/reinforced @@ -86,6 +87,7 @@ GLOBAL_LIST_INIT(glass_radial_images, list( desc = "Reinforced glass is made out of squares of regular silicate glass layered on a metallic rod matrice. This glass is more resistant to direct impacts, even if it may crack." singular_name = "reinforced glass sheet" icon_state = "sheet-rglass" + item_state = "sheet-rglass" created_window = /obj/structure/window/reinforced is_reinforced = TRUE diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e3b0837391f5c..2fb9b0c11ed43 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -63,6 +63,7 @@ GLOBAL_LIST_INIT(metal_radial_images, list( desc = "Sheets made out of metal. It has been dubbed Metal Sheets." singular_name = "metal sheet" icon_state = "sheet-metal" + item_state = "sheet-metal" flags_item = NOBLUDGEON throwforce = 14 flags_atom = CONDUCT @@ -116,7 +117,7 @@ GLOBAL_LIST_INIT(metal_radial_images, list( singular_name = "plasteel sheet" desc = "This sheet is an alloy of iron and phoron." icon_state = "sheet-plasteel" - item_state = "sheet-metal" + item_state = "sheet-plasteel" flags_item = NOBLUDGEON throwforce = 15 flags_atom = CONDUCT @@ -169,6 +170,7 @@ GLOBAL_LIST_INIT(wood_radial_images, list( desc = "One can only guess that this is a bunch of wood." singular_name = "wood plank" icon_state = "sheet-wood" + item_state = "sheet-wood" merge_type = /obj/item/stack/sheet/wood number_of_extra_variants = 3 diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm index d6d930f63b3a4..4dc1ff8fac24e 100644 --- a/code/game/objects/items/tools/shovel_tools.dm +++ b/code/game/objects/items/tools/shovel_tools.dm @@ -131,6 +131,7 @@ desc = "Used to dig holes and bash heads in. Folds in to fit in small spaces. Use a sharp item on it to sharpen it." icon = 'icons/Marine/marine-items.dmi' icon_state = "etool_c" + item_state = "etool_c" force = 2 throwforce = 2 hitsound = "sound/weapons/shovel.ogg" @@ -143,10 +144,13 @@ /obj/item/tool/shovel/etool/update_icon_state() if(!folded && !sharp) icon_state = "etool" + item_state = "etool" else if(sharp) icon_state = "etool_s" + item_state = "etool" else icon_state = "etool_c" + item_state = "etool_c" ..() /obj/item/tool/shovel/etool/attack_self(mob/user as mob) diff --git a/code/modules/requisitions/fulton.dm b/code/modules/requisitions/fulton.dm index f06b2cf7aba65..4cd0ec470e2ba 100644 --- a/code/modules/requisitions/fulton.dm +++ b/code/modules/requisitions/fulton.dm @@ -3,6 +3,11 @@ desc = "A balloon that can be used to extract equipment or personnel. Anything not bolted down can be moved." icon = 'icons/obj/items/fulton.dmi' icon_state = "extraction_pack" + item_state = "fulton" + item_icons = list( + slot_l_hand_str = 'icons/mob/inhands/equipment/tools_left.dmi', + slot_r_hand_str = 'icons/mob/inhands/equipment/tools_right.dmi', + ) w_class = WEIGHT_CLASS_NORMAL tool_behaviour = TOOL_FULTON resistance_flags = RESIST_ALL diff --git a/icons/mob/inhands/equipment/engineering_left.dmi b/icons/mob/inhands/equipment/engineering_left.dmi index fea1783c4e6ef..7c581d200b1a3 100644 Binary files a/icons/mob/inhands/equipment/engineering_left.dmi and b/icons/mob/inhands/equipment/engineering_left.dmi differ diff --git a/icons/mob/inhands/equipment/engineering_right.dmi b/icons/mob/inhands/equipment/engineering_right.dmi index 1f8af973fea3b..bbfcd06b8c932 100644 Binary files a/icons/mob/inhands/equipment/engineering_right.dmi and b/icons/mob/inhands/equipment/engineering_right.dmi differ diff --git a/icons/mob/inhands/equipment/tools_left.dmi b/icons/mob/inhands/equipment/tools_left.dmi index e8bc2c6be2fa6..7718451851c04 100644 Binary files a/icons/mob/inhands/equipment/tools_left.dmi and b/icons/mob/inhands/equipment/tools_left.dmi differ diff --git a/icons/mob/inhands/equipment/tools_right.dmi b/icons/mob/inhands/equipment/tools_right.dmi index bd20799c7b8c4..83271a6d40c2a 100644 Binary files a/icons/mob/inhands/equipment/tools_right.dmi and b/icons/mob/inhands/equipment/tools_right.dmi differ diff --git a/icons/mob/inhands/items/stacks_left.dmi b/icons/mob/inhands/items/stacks_left.dmi index 63b7f08b08aa0..15dee42a65c16 100644 Binary files a/icons/mob/inhands/items/stacks_left.dmi and b/icons/mob/inhands/items/stacks_left.dmi differ diff --git a/icons/mob/inhands/items/stacks_right.dmi b/icons/mob/inhands/items/stacks_right.dmi index bbba34ff752da..c8cfc7f373693 100644 Binary files a/icons/mob/inhands/items/stacks_right.dmi and b/icons/mob/inhands/items/stacks_right.dmi differ diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi index 15f9d06527f8b..8ab51aeed1a99 100644 Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ