Skip to content

Commit

Permalink
Ports various /tg/ sprites (Monkestation#2365)
Browse files Browse the repository at this point in the history
* Engitools resprite (#78236)

## About The Pull Request

Title. The time has come to resprite one of the oldest and soulful
sprites in the game. I really hope you'lll love 'em!


![pleasedonthateme](https://github.com/tgstation/tgstation/assets/137328283/ec2d47ab-aad0-449c-b0a4-7eb66cee39ff)


## Why It's Good For The Game

Remade sprites for t-ray scanner, gas analyzer, geiger counter and hand
drill to fit current art style. Now they look juicier and thicker, i
guess.

## Changelog

:cl:
image: resprites t-ray scanner, gas analyzer, geiger counter and hand
drill.
/:cl:

* Medical/improvised gauze icons (#81802)

## About The Pull Request

Adds icons for stacks of medical gauze and improvised gauze, so that
they can be differentiated from stacks of cloth. Currently all 3 look
the same. Medical gauze is blue tinted like the medical tape, improvised
gauze is grey and a smaller size than medical gauze. Both have
attachment clips at the edge of the roll.


![image](https://github.com/tgstation/tgstation/assets/83487515/47bcd42e-7270-498e-aacb-15d5a39fd432)

## Why It's Good For The Game

Easier to tell three different items apart at a glance.

## Changelog

:cl: LT3
image: medical and improvised gauze are visibly different from cloth
/:cl:

* Readability Pass to Advanced Medical Tools (#82225)

Update the sprites of the advanced surgical toolset, giving them
distinct colors and updating their lighting to reduce shades and
increase visual readability at normal resolutions.

![image](https://github.com/tgstation/tgstation/assets/32783144/4daa4f95-2415-4d60-a666-361ebfc52281)

![image](https://github.com/tgstation/tgstation/assets/32783144/b3dfba7b-3db9-42ab-b088-a6e592a3297a)

![image](https://github.com/tgstation/tgstation/assets/32783144/65efec62-aaec-4e86-8a3c-5a57aa08198e)

Currently, the advanced surgical toolset over-relies on the tooltip to
communicate item state quickly and accurately. This PR adds both color
differentials, and enhances the shape of the existing tools to help a
player tell them apart quickly and accurately. Additionally, it assists
in defining the general shape of the item with cleaned up shading to
decrease noisy patterns in the sprite.
:cl:
image: Updated the Advanced Surgical Tool's sprites
code: Updated the Advanced Surgical Tool's light code
/:cl:

---------

Co-authored-by: Interception&? <137328283+intercepti0n@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Alexios <32783144+Alecksohs@users.noreply.github.com>
  • Loading branch information
4 people authored Jun 26, 2024
1 parent 614dc06 commit ffc8269
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/stacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
name = "improvised gauze"
singular_name = "improvised gauze"
desc = "A roll of cloth roughly cut from something that does a decent job of stabilizing wounds, but less efficiently so than real medical gauze."
icon_state = "gauze_imp"
self_delay = 6 SECONDS
other_delay = 3 SECONDS
splint_factor = 0.85
Expand Down
16 changes: 11 additions & 5 deletions code/modules/surgery/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
light_system = OVERLAY_LIGHT
light_outer_range = 1
light_outer_range = 1.5
light_color = COLOR_SOFT_RED

/obj/item/cautery/advanced/get_all_tool_behaviours()
Expand All @@ -119,7 +119,13 @@
/obj/item/cautery/advanced/proc/on_transform(obj/item/source, mob/user, active)
SIGNAL_HANDLER

tool_behaviour = (active ? TOOL_DRILL : TOOL_CAUTERY)
if(active)
tool_behaviour = TOOL_DRILL
set_light_color(LIGHT_COLOR_BLUE)
else
tool_behaviour = TOOL_CAUTERY
set_light_color(LIGHT_COLOR_ORANGE)

balloon_alert(user, "lenses set to [active ? "drill" : "mend"]")
playsound(user ? user : src, 'sound/weapons/tap.ogg', 50, TRUE)
return COMPONENT_NO_DEFAULT_MESSAGE
Expand Down Expand Up @@ -372,7 +378,7 @@
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
light_system = OVERLAY_LIGHT
light_outer_range = 1
light_outer_range = 1.5
light_color = LIGHT_COLOR_BLUE
sharpness = SHARP_EDGED

Expand Down Expand Up @@ -403,10 +409,10 @@

if(active)
tool_behaviour = TOOL_SAW
set_light_range(2)
set_light_color(LIGHT_COLOR_ORANGE)
else
tool_behaviour = TOOL_SCALPEL
set_light_range(1)
set_light_color(LIGHT_COLOR_BLUE)

balloon_alert(user, "[active ? "enabled" : "disabled"] bone-cutting mode")
playsound(user ? user : src, 'sound/machines/click.ogg', 50, TRUE)
Expand Down
Binary file modified icons/obj/device.dmi
Binary file not shown.
Binary file modified icons/obj/medical/stack_medical.dmi
Binary file not shown.
Binary file modified icons/obj/medical/surgery_tools.dmi
Binary file not shown.
Binary file modified icons/obj/tools.dmi
Binary file not shown.

0 comments on commit ffc8269

Please sign in to comment.