Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/spells/spell_types/jaunt/tar_pool.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/action/cooldown/spell/jaunt/ethereal_jaunt/tar_pool
name = "Return to tar"
desc = "Temporarily dissolve into a pool of tar, in this form you are involnurable to damage."
desc = "Temporarily dissolve into a pool of tar, in this form you are invulnerable to damage."
button_icon = 'yogstation/icons/mob/actions/actions.dmi'
button_icon_state = "tarshift"
background_icon = 'yogstation/icons/mob/actions/backgrounds.dmi'
Expand Down
14 changes: 7 additions & 7 deletions yogstation/code/modules/jungleland/jungle_structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ GLOBAL_LIST_INIT(nests, list())

/obj/structure/tar_assistant_spawner/Initialize()
. = ..()
update_icon()
update_appearance(UPDATE_OVERLAYS)

/obj/structure/tar_assistant_spawner/examine(mob/user)
. = ..()
Expand All @@ -463,11 +463,11 @@ GLOBAL_LIST_INIT(nests, list())
else
. += "There is a humanoid shaped hole carved into the pillar..."

/obj/structure/tar_assistant_spawner/update_icon()
. = ..()
cut_overlays()
if(!used)
add_overlay(image(icon=src.icon,icon_state="tar_assistant"))
/obj/structure/tar_assistant_spawner/update_overlays()
. = ..()
if(used)
return
. += mutable_appearance(icon, "tar_assistant")

/obj/structure/tar_assistant_spawner/attack_hand(mob/user)
if(used)
Expand Down Expand Up @@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(nests, list())
to_chat(user,span_boldnotice("A wave of unusual energy washes over you as you realize you are now the master of [H]."))
used = TRUE
in_use = FALSE
update_icon()
update_appearance(UPDATE_OVERLAYS)

/obj/effect/dummy/phased_mob/spell_jaunt/tar_pool
name = "pool of tar"
Expand Down