Skip to content

Commit

Permalink
tgui-ification
Browse files Browse the repository at this point in the history
  • Loading branch information
XeonMations committed Aug 11, 2024
1 parent 58af8b9 commit fccdca1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
return TRUE
if(user.incapacitated(ignore_restraints = TRUE)) //Are we incapacitated right now?
return FALSE
if(alert("Are we sure we wish to kill ourselves and split into seperated nymphs?",,"Yes", "No") != "Yes")
if(tgui_alert(usr, "Are we sure we wish to devolve ourselves and split into separated nymphs?",,list("Yes", "No")) != "Yes")
return FALSE
if(do_after(user, 8 SECONDS, user, IGNORE_RESTRAINED, TRUE))
if(user.incapacitated(ignore_restraints = TRUE)) //Second check incase the ability was activated RIGHT as we were being cuffed, and thus now in cuffs when this triggers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
var/assimilating = FALSE
var/grown_message_sent = FALSE

/mob/living/simple_animal/hostile/retaliate/nymph/Initialize()
/mob/living/simple_animal/hostile/retaliate/nymph/Initialize(mapload)
. = ..()
time_of_birth = world.time
evolve_ability = new
Expand Down Expand Up @@ -150,7 +150,7 @@
if(!is_ghost_spawn || stat == DEAD)
to_chat(user, "<span class='warning'>\The [src] is not possessable!")
return
var/control_ask = alert("Do you wish to take control of \the [src]", "Chirp Time?", "Yes", "No")
var/control_ask = tgui_alert(usr, "Do you wish to take control of \the [src]", "Chirp Time?", list("Yes", "No"))
if(control_ask == "No" || !src || QDELETED(src) || QDELETED(user))
return FALSE
if(QDELETED(src) || QDELETED(user) || !user.client)
Expand Down Expand Up @@ -199,7 +199,7 @@
qdel(L)

src.visible_message(
("<span class='warning'>[src] begins to shift and quiver, and after engulfing another nymph, erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea."),
("<span class='warning'>[src] begins to shift and quiver, and after engulfing another nymph, erupts in a shower of shed bark as it splits into a tangle of a new diona gestalt.</span>"),
("<span class='warning'>You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients and, along with a friend, surge with growth, splitting into a tangle of at least a dozen new vines. We have attained our gestalt form. Our friends should help with obtaining the rest of our limbs...")
)

Expand Down

0 comments on commit fccdca1

Please sign in to comment.