Skip to content

Commit

Permalink
Animated revival icons on minimap, new minimap icons for revival stag…
Browse files Browse the repository at this point in the history
…es (#7445)

# About the pull request

Adds animated stages of time left for revival on minimap

(Tweaked it a bit to be slower than on this gif)

![dreamseeker_JWpwNBxPS2](https://github.com/user-attachments/assets/1a061492-6110-4478-89e7-2184328e6a25)


![dreammaker_9WL1mOd2vJ](https://github.com/user-attachments/assets/5a6d507c-b321-4810-93ce-c50ae5603877)


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: dead marines now have minimap revival icons animated, different
icons depending on how much time is left
/:cl:
  • Loading branch information
Blundir authored Oct 31, 2024
1 parent 09e9e6e commit ce6543b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/datums/mob_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
holder2.icon_state = "huddeaddefib"
holder3.icon_state = "huddead"
holder2_set = 1
update_minimap_icon()
else
if(is_heart_broken()) // broken heart icon
holder.icon_state = "huddeadheart"
Expand Down
11 changes: 10 additions & 1 deletion code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,16 @@

///Change the minimap icon to a dead icon
/obj/item/device/radio/headset/proc/set_dead_on_minimap(z_level, marker_flags)
SSminimaps.add_marker(wearer, z_level, marker_flags, given_image = wearer.assigned_equipment_preset.get_minimap_icon(wearer), overlay_iconstates = list("defibbable"))
var/icon_to_use
if(world.time > wearer.timeofdeath + wearer.revive_grace_period - 1 MINUTES)
icon_to_use = "defibbable4"
else if(world.time > wearer.timeofdeath + wearer.revive_grace_period - 2 MINUTES)
icon_to_use = "defibbable3"
else if(world.time > wearer.timeofdeath + wearer.revive_grace_period - 3 MINUTES)
icon_to_use = "defibbable2"
else
icon_to_use = "defibbable"
SSminimaps.add_marker(wearer, z_level, marker_flags, given_image = wearer.assigned_equipment_preset.get_minimap_icon(wearer), overlay_iconstates = list(icon_to_use))

///Change the minimap icon to a undefibbable icon
/obj/item/device/radio/headset/proc/set_undefibbable_on_minimap(z_level, marker_flags)
Expand Down
Binary file modified icons/ui_icons/map_blips.dmi
Binary file not shown.

0 comments on commit ce6543b

Please sign in to comment.