Skip to content

Egg and Acid Trap corner triggers #12725

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

Open
JackieEstegado wants to merge 6 commits into
base: master
Choose a base branch
from
+10 −5
Open

Egg and Acid Trap corner triggers #12725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a3ac29
Egg corner fixed
JackieEstegado Jul 25, 2026
d56e8c9
Trap corner fixed
JackieEstegado Jul 25, 2026
478dbf1
Lets be consistent
JackieEstegado Jul 25, 2026
5789836
Better naming
JackieEstegado Jul 25, 2026
02f3746
Ooopsie
JackieEstegado Jul 25, 2026
d91d93c
Merge remote-tracking branch 'upstream/master' into corner_trigger_fix
JackieEstegado Jul 29, 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
12 changes: 7 additions & 5 deletions code/modules/cm_aliens/structures/egg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,17 @@
if(health <= 0)
Burst(TRUE)

/obj/effect/alien/egg/Crossed(atom/movable/AM)
/obj/effect/alien/egg/Crossed(atom/movable/victim)
..()
HasProximity(AM)
HasProximity(victim)

/obj/effect/alien/egg/HasProximity(atom/movable/AM)
/obj/effect/alien/egg/HasProximity(atom/movable/victim)
if(status == EGG_GROWN)
if(!can_hug(AM, hivenumber) || isyautja(AM) || issynth(AM)) //Predators are too stealthy to trigger eggs to burst. Maybe the huggers are afraid of them.
if(!can_hug(victim, hivenumber) || isyautja(victim) || issynth(victim)) //Predators are too stealthy to trigger eggs to burst. Maybe the huggers are afraid of them.
return
Burst(FALSE, TRUE, null)
var/list/possible_victims = hearers(1, src)
if(possible_victims.Find(victim))
Burst(FALSE, TRUE, null)

/obj/effect/alien/egg/flamer_fire_act() // gotta kill the egg + hugger
Burst(TRUE)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/cm_aliens/structures/trap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
victim_mob.apply_effect(1, WEAKEN)
trigger_trap()
if(RESIN_TRAP_GAS, RESIN_TRAP_ACID1, RESIN_TRAP_ACID2, RESIN_TRAP_ACID3)
var/list/possible_victims = hearers(1, src)
if(!possible_victims.Find(victim))
return
if(ishuman_strict(victim))
var/mob/living/carbon/human/victim_human = victim
if(victim_human.stat == DEAD || victim_human.body_position == LYING_DOWN)
Expand Down