Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Massive inhand sprite changes #14605

Merged
merged 11 commits into from Jul 15, 2023
6 changes: 6 additions & 0 deletions code/modules/food_and_drink/snacks.dm
Expand Up @@ -1376,6 +1376,7 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
desc = "Goes great with Robust Coffee."
icon = 'icons/obj/foodNdrink/donuts.dmi'
icon_state = "base"
item_state = "donut1"
flags = FPRINT | TABLEPASS | NOSPLASH
appearance_flags = KEEP_TOGETHER | PIXEL_SCALE
heal_amt = 1
Expand Down Expand Up @@ -1457,18 +1458,21 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
frosted
name = "frosted donut"
icon_state = "donut2"
item_state = "donut2"
heal_amt = 2

cinnamon
name = "cinnamon sugar donut"
desc = "One of Delectable Dan's seasonal bestsellers."
icon_state = "donut3"
item_state = "donut3"
heal_amt = 3

robust
name = "robust donut"
desc = "It's like an energy bar, but in donut form! Contains some chemicals known for partial stun time reduction and boosted stamina regeneration."
icon_state = "donut4"
item_state = "donut4"
bites_left = 4
initial_volume = 36
initial_reagents = list("sugar"=12,"synaptizine"=12,"epinephrine"=12)
Expand All @@ -1477,6 +1481,7 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
name = "robusted donut"
desc = "A donut for those harsh moments. Contains a mix of chemicals for cardiac emergency recovery and any minor trauma that accompanies it."
icon_state = "donut5"
item_state = "donut5"
bites_left = 4
initial_volume = 40
initial_reagents = list("salbutamol"=12,"epinephrine"=12,"saline"=16)
Expand All @@ -1485,6 +1490,7 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
New()
if(rand(1,3) == 1)
src.icon_state = "donut2"
src.item_state = "donut2"
src.name = "frosted donut"
src.heal_amt = 2
..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/writing/pens_writing_etc.dm
Expand Up @@ -880,6 +880,7 @@
name = "hand labeler"
icon = 'icons/obj/writing.dmi'
icon_state = "labeler"
inhand_image_icon = 'icons/mob/inhand/hand_tools.dmi'
item_state = "labeler"
desc = "Make things seem more important than they really are with the hand labeler!<br/>Can also name your fancy new area by naming the fancy new APC you created for it."
var/label = null
Expand Down
4 changes: 2 additions & 2 deletions code/obj/item/book.dm
Expand Up @@ -13,7 +13,7 @@ Custom Books
icon = 'icons/obj/writing.dmi'
icon_state = "book0"
inhand_image_icon = 'icons/mob/inhand/hand_books.dmi'
item_state = "paper"
item_state = "book"
layer = OBJ_LAYER
//cogwerks - burn vars
burn_point = 400
Expand Down Expand Up @@ -338,7 +338,7 @@ Custom Books
icon = 'icons/obj/writing.dmi'
icon_state = "pinkbook"
inhand_image_icon = 'icons/mob/inhand/hand_books.dmi'
item_state = "paper"
item_state = "book"
layer = OBJ_LAYER

New()
Expand Down
1 change: 1 addition & 0 deletions code/obj/item/table_rack_parts.dm
Expand Up @@ -292,6 +292,7 @@ TYPEINFO(/obj/item/furniture_parts/table/glass)
desc = "A collection of parts that can be used to make a rack."
icon = 'icons/obj/metal.dmi'
icon_state = "rack_base_parts"
item_state = "rack_parts"
stamina_damage = 25
stamina_cost = 22
stamina_crit_chance = 15
Expand Down
1 change: 1 addition & 0 deletions code/obj/item/tank.dm
Expand Up @@ -488,6 +488,7 @@ TYPEINFO(/obj/item/tank/jetpack/micro)
/obj/item/tank/mini_oxygen
name = "mini oxygen tank"
icon_state = "mini_oxtank"
item_state = "em_oxtank"
flags = FPRINT | TABLEPASS | CONDUCT
c_flags = ONBELT
health = 5
Expand Down
4 changes: 4 additions & 0 deletions code/obj/item/tool/wrench.dm
Expand Up @@ -63,15 +63,19 @@
/obj/item/wrench/yellow
desc = "A tool used to apply torque to turn nuts and bolts. This one has a bright yellow handle."
icon_state = "wrench-yellow"
item_state = "wrench"

/obj/item/wrench/grey
desc = "A tool used to apply torque to turn nuts and bolts, sporting a droll grey grip."
icon_state = "wrench-grey"
item_state = "wrench"

/obj/item/wrench/orange
desc = "A tool used to apply torque to turn nuts and bolts. But orange!"
icon_state = "wrench-orange"
item_state = "wrench"

/obj/item/wrench/green
desc = "A tool used to apply torque to turn nuts and bolts. In green!"
icon_state = "wrench-green"
item_state = "wrench"
Binary file modified icons/mob/inhand/hand_books.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_food.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_general.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_headgear.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_instruments.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_medical.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/hand_tools.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/overcoat/hand_suit_armor.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/tools/crowbar.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/tools/multitool.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/tools/omnitool.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/tools/weldingtool.dmi
Binary file not shown.
Binary file modified icons/mob/inhand/tools/wrench.dmi
Binary file not shown.