Skip to content

Commit

Permalink
Inhands tools, stacks sprites fix & small resprite (#13803)
Browse files Browse the repository at this point in the history
* inhands fixes and resprites

* tab issue

* etool small fix
  • Loading branch information
Blundir authored Aug 16, 2023
1 parent 74ccdd1 commit 0cb5f03
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 1 deletion.
10 changes: 10 additions & 0 deletions code/game/objects/items/stacks/sandbags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/stacks/sheets/glass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/tools/shovel_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/requisitions/fulton.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/mob/inhands/equipment/engineering_left.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/engineering_right.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/tools_left.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/tools_right.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items/stacks_left.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items/stacks_right.dmi
Binary file not shown.
Binary file modified icons/obj/items/items.dmi
Binary file not shown.

0 comments on commit 0cb5f03

Please sign in to comment.