Skip to content

Aligator #56

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 3 commits into from
Jun 24, 2026
Merged

Aligator #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eb3504
perhaps now
cuberound Jun 23, 2026
00b45ed
stop pulling
cuberound Jun 24, 2026
0a9e5f5
exceptions for create and destroy
cuberound Jun 24, 2026
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
4 changes: 4 additions & 0 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 @@ -19,6 +19,10 @@
has_tongue = FALSE
var/pulling_state = "Bortrough Running Open Jaws"

/mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough/Destroy()
. = ..()
stop_pulling()

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

Expand Down
7 changes: 3 additions & 4 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 @@ -167,10 +167,9 @@
. = ..()
wound_icon_holder = new(null, src)
wound_icon_holder.icon = wound_icon
if(has_tongue)
tongue_icon_holder = new(null, src)
tongue_icon_holder.pixel_x = 2
vis_contents += tongue_icon_holder
tongue_icon_holder = new(null, src)
tongue_icon_holder.pixel_x = 2
vis_contents += tongue_icon_holder

vis_contents += wound_icon_holder

Expand Down
2 changes: 2 additions & 0 deletions code/modules/unit_tests/create_and_destroy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ GLOBAL_VAR_INIT(create_and_destroy_ignore_paths, generate_ignore_paths())
/obj/item/explosive/grenade/flashbang/cluster/segment,
/obj/item/explosive/grenade/flashbang/cluster_piece,
/mob/living/simple_animal/hostile/retaliate/giant_lizard,
/mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough,
/obj/effect/landmark/lizard_spawn,
/obj/effect/landmark/lizard_spawn/bortrough,
/obj/effect/fake_attacker,
/atom/movable/lighting_mask, //leave it alone
//This is meant to fail extremely loud every single time it occurs in any environment in any context, and it falsely alarms when this unit test iterates it. Let's not spawn it in.
Expand Down
Loading