Skip to content

has tounge no #54

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.

Sign up for GitHub

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

Merged
Steelpoint merged 1 commit into from
Jun 23, 2026
Merged

has tounge no #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions code/modules/mob/living/simple_animal/hostile/retaliate/bortrough.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,9 @@
hiss_sound = "bortrough_hiss"
wound_icon = 'icons/mob/bortrough.dmi'
pixel_x = -22
has_tongue = FALSE
var/pulling_state = "Bortrough Running Open Jaws"

/mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough/Initialize()
. = ..()
tongue_icon_holder.icon_state = "none"

/mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough/change_tongue_offset()
return

/mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough/ListTargets(dist = 4)
. = ..()

Expand Down
30 changes: 21 additions & 9 deletions code/modules/mob/living/simple_animal/hostile/retaliate/giant_lizard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@

var/wound_icon = 'icons/mob/mob_64.dmi'

var/has_tongue = TRUE

///Reference to the ZZzzz sleep overlay when resting.
var/sleep_overlay
///Reference to the tongue flick overlay.
Expand Down Expand Up @@ -120,6 +122,9 @@
/mob/living/simple_animal/hostile/retaliate/giant_lizard/proc/change_tongue_offset(datum/source, olddir, newdir)
SIGNAL_HANDLER

if(!has_tongue)
return

if(!newdir)
newdir = dir

Expand Down Expand Up @@ -162,10 +167,13 @@
. = ..()
wound_icon_holder = new(null, src)
wound_icon_holder.icon = wound_icon
tongue_icon_holder = new(null, src)
tongue_icon_holder.pixel_x = 2
if(has_tongue)
tongue_icon_holder = new(null, src)
tongue_icon_holder.pixel_x = 2
vis_contents += tongue_icon_holder

vis_contents += wound_icon_holder
vis_contents += tongue_icon_holder


RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(change_tongue_offset))

Expand Down Expand Up @@ -246,15 +254,17 @@
walk_to(src, 0)

/mob/living/simple_animal/hostile/retaliate/giant_lizard/update_transform(instant_update = FALSE)
tongue_icon_holder.alpha = alpha
if(has_tongue)
tongue_icon_holder.alpha = alpha
if(stat == DEAD)
icon_state = icon_dead
else if(body_position == LYING_DOWN)
if(!HAS_TRAIT(src, TRAIT_INCAPACITATED) && !HAS_TRAIT(src, TRAIT_FLOORED))
icon_state = "[base_state] Sleeping"
else
icon_state = "[base_state] Knocked Down"
tongue_icon_holder.alpha = 0
if(has_tongue)
tongue_icon_holder.alpha = 0
//we can't stop an animation that's called via flick(). best we can do is hide it.
else
icon_state = icon_living
Expand Down Expand Up @@ -370,7 +380,8 @@
manual_emote(pick(pick(pet_emotes), "stares at [attacking_mob].", "nuzzles [attacking_mob].", "licks [attacking_mob]'s hand."), "nibbles [attacking_mob]'s arm.")
if(prob(50))
playsound(loc, hiss_sound, 25)
flick("Giant Lizard Tongue", tongue_icon_holder)
if(has_tongue)
flick("Giant Lizard Tongue", tongue_icon_holder)
if(attacking_mob.a_intent == INTENT_DISARM && prob(25))
playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1)
KnockDown(0.4)
Expand Down Expand Up @@ -447,7 +458,8 @@
AddSleepingIcon()

if(stat != DEAD && !HAS_TRAIT(src, TRAIT_INCAPACITATED) && !HAS_TRAIT(src, TRAIT_FLOORED) && prob(25))
flick("Giant Lizard Tongue", tongue_icon_holder)
if(has_tongue)
flick("Giant Lizard Tongue", tongue_icon_holder)

if(bleed_ticks)
var/is_small_pool = FALSE
Expand Down Expand Up @@ -1023,8 +1035,8 @@
. = ..()
if(!.)
return

flick("Giant Lizard Tongue", user.tongue_icon_holder)
if(has_tongue)
flick("Giant Lizard Tongue", user.tongue_icon_holder)

#undef ATTACK_SLASH
#undef ATTACK_BITE
Expand Down
Loading