diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 0936e91e128..488df7c5141 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -97,10 +97,10 @@ ..() for (var/datum/weakref/carp_weakref in spawned_carp) - var/mob/living/simple_animal/hostile/carp/fish = carp_weakref.resolve() + var/mob/fish = carp_weakref.resolve() if (fish && prob(50) && is_type_in_typecache(fish.loc, despawn_turfs)) spawned_carp -= carp_weakref - qdel(carp_weakref) + qdel(fish) spawned_carp?.Cut() /datum/event/carp_migration/cozmo/start() diff --git a/code/modules/events/wandering_psirens.dm b/code/modules/events/wandering_psirens.dm index 7809e83008e..1cc90451b33 100644 --- a/code/modules/events/wandering_psirens.dm +++ b/code/modules/events/wandering_psirens.dm @@ -72,7 +72,7 @@ var/mob/living/simple_animal/hostile/psiren/psiren = psiren_weakref.resolve() if (psiren && prob(50) && is_type_in_typecache(psiren.loc, despawn_turfs)) spawned_psirens -= psiren_weakref - qdel(psiren_weakref) + qdel(psiren) spawned_psirens?.Cut() /datum/event/wandering_psirens/overmap diff --git a/html/changelogs/hellfirejag-carp-migration-harddel.yml b/html/changelogs/hellfirejag-carp-migration-harddel.yml new file mode 100644 index 00000000000..19947080bc0 --- /dev/null +++ b/html/changelogs/hellfirejag-carp-migration-harddel.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a hard del caused by ccarp and psiren migrations."