From 07b4d1168183b6aa76e1542fd9e214a6a05da8c2 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 7 Aug 2025 16:11:10 -0400 Subject: [PATCH] Hotfix for augment spawning (#21125) It was just always true, wack. --- code/modules/client/preference_setup/loadout/loadout.dm | 4 ++-- html/changelogs/Hellfirejag_augmentspawninghotfix.yml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Hellfirejag_augmentspawninghotfix.yml diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index d64c3126b77..6678a40faf6 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -577,8 +577,8 @@ GLOBAL_LIST_INIT(gear_datums, list()) // Handling for "Organ swapping" augments. Anything that shares an organ tag with a pre-existing organ. if(ispath(spawn_path, /obj/item/organ/internal)) var/obj/item/organ/internal/internal_aug = spawn_path - var/obj/item/organ/internal/replaced_organ = H.get_organ(initial(internal_aug.organ_tag)) - if(internal_aug.organ_tag == replaced_organ.organ_tag) + var/obj/item/organ/internal/replaced_organ = H.internal_organs_by_name[internal_aug.organ_tag] + if(replaced_organ && internal_aug.organ_tag == replaced_organ.organ_tag) replaced_organ.removed(H, null) qdel(replaced_organ) diff --git a/html/changelogs/Hellfirejag_augmentspawninghotfix.yml b/html/changelogs/Hellfirejag_augmentspawninghotfix.yml new file mode 100644 index 00000000000..69b2f92be69 --- /dev/null +++ b/html/changelogs/Hellfirejag_augmentspawninghotfix.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed augments failing to spawn."