From 7a3ac292c3dc076b28afbd1e74428b713264d794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rig=C3=B3=20J=C3=A1nos?= Date: Sat, 25 Jul 2026 19:09:00 +0200 Subject: [PATCH 1/5] Egg corner fixed --- code/modules/cm_aliens/structures/egg.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index fdc02587ae1b..8cb8906216f3 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -310,14 +310,16 @@ if(health <= 0) Burst(TRUE) -/obj/effect/alien/egg/Crossed(atom/movable/AM) - HasProximity(AM) +/obj/effect/alien/egg/Crossed(atom/movable/moving_thing) + HasProximity(moving_thing) -/obj/effect/alien/egg/HasProximity(atom/movable/AM) +/obj/effect/alien/egg/HasProximity(atom/movable/moving_thing) 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(moving_thing, hivenumber) || isyautja(moving_thing) || issynth(moving_thing)) //Predators are too stealthy to trigger eggs to burst. Maybe the huggers are afraid of them. return - Burst(FALSE, TRUE, null) + for(var/mob/living/nearbies in hearers(1, src)) + if(nearbies == moving_thing) + Burst(FALSE, TRUE, null) /obj/effect/alien/egg/flamer_fire_act() // gotta kill the egg + hugger Burst(TRUE) From d56e8c968de73d4014b90f73d52f404a40b51803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rig=C3=B3=20J=C3=A1nos?= Date: Sat, 25 Jul 2026 19:36:35 +0200 Subject: [PATCH 2/5] Trap corner fixed --- code/modules/cm_aliens/structures/trap.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm index 5caf6f0ff713..ac5528846ab6 100644 --- a/code/modules/cm_aliens/structures/trap.dm +++ b/code/modules/cm_aliens/structures/trap.dm @@ -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/nearbies = hearers(1, src) + if(!nearbies.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) From 478dbf1dce80b08a26f8ce597abd25a116de6c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rig=C3=B3=20J=C3=A1nos?= Date: Sat, 25 Jul 2026 19:39:06 +0200 Subject: [PATCH 3/5] Lets be consistent --- code/modules/cm_aliens/structures/egg.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 8cb8906216f3..5063753db934 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -317,9 +317,9 @@ if(status == EGG_GROWN) if(!can_hug(moving_thing, hivenumber) || isyautja(moving_thing) || issynth(moving_thing)) //Predators are too stealthy to trigger eggs to burst. Maybe the huggers are afraid of them. return - for(var/mob/living/nearbies in hearers(1, src)) - if(nearbies == moving_thing) - Burst(FALSE, TRUE, null) + var/list/list/nearbies in hearers(1, src) + if(nearbies.Find(moving_thing)) + Burst(FALSE, TRUE, null) /obj/effect/alien/egg/flamer_fire_act() // gotta kill the egg + hugger Burst(TRUE) From 57898368e05e28d87fd09fc485a7f765ea5462a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rig=C3=B3=20J=C3=A1nos?= Date: Sat, 25 Jul 2026 19:42:00 +0200 Subject: [PATCH 4/5] Better naming --- code/modules/cm_aliens/structures/egg.dm | 12 ++++++------ code/modules/cm_aliens/structures/trap.dm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 5063753db934..1738a5a5f5be 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -310,15 +310,15 @@ if(health <= 0) Burst(TRUE) -/obj/effect/alien/egg/Crossed(atom/movable/moving_thing) - HasProximity(moving_thing) +/obj/effect/alien/egg/Crossed(atom/movable/victim) + HasProximity(victim) -/obj/effect/alien/egg/HasProximity(atom/movable/moving_thing) +/obj/effect/alien/egg/HasProximity(atom/movable/victim) if(status == EGG_GROWN) - if(!can_hug(moving_thing, hivenumber) || isyautja(moving_thing) || issynth(moving_thing)) //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 - var/list/list/nearbies in hearers(1, src) - if(nearbies.Find(moving_thing)) + var/list/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 diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm index ac5528846ab6..0c4f13a6686e 100644 --- a/code/modules/cm_aliens/structures/trap.dm +++ b/code/modules/cm_aliens/structures/trap.dm @@ -99,8 +99,8 @@ victim_mob.apply_effect(1, WEAKEN) trigger_trap() if(RESIN_TRAP_GAS, RESIN_TRAP_ACID1, RESIN_TRAP_ACID2, RESIN_TRAP_ACID3) - var/list/nearbies = hearers(1, src) - if(!nearbies.Find(victim)) + 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 From 02f3746afffe53765a43b2d21b0a4c92d7174a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rig=C3=B3=20J=C3=A1nos?= Date: Sat, 25 Jul 2026 20:10:12 +0200 Subject: [PATCH 5/5] Ooopsie --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 1738a5a5f5be..cf254df0d0bc 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -317,7 +317,7 @@ if(status == EGG_GROWN) 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 - var/list/list/possible_victims = hearers(1, src) + var/list/possible_victims = hearers(1, src) if(possible_victims.Find(victim)) Burst(FALSE, TRUE, null)