From 7b1d396773fe19e258c8f3c47fc91e976aebb0db Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:14:33 +0200 Subject: [PATCH] [MIRROR] Fixes a bug where borgs effectively break IDs when removing them from modular consoles [MDB IGNORE] (#22612) * Fixes a bug where borgs effectively break IDs when removing them from modular consoles (#76948) ## About The Pull Request Fixes a bug where borgs effectively break IDs when removing them from modular consoles. Previously when they did this it would cause the ID to be unretrievable. ## Why It's Good For The Game Fixes a stinky bug!! ## Changelog :cl:Sapphoqueer fix: fixes a bug where borgs and TK users could effectively break ID's by removing them from modular computers. /:cl: * Fixes a bug where borgs effectively break IDs when removing them from modular consoles --------- Co-authored-by: SapphoQueer <94389951+SapphoQueer@users.noreply.github.com> --- .../modules/modular_computers/computers/item/computer.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index b3517f4e41e..a8e07b55f1a 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -280,16 +280,15 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(crew_manifest_update) GLOB.manifest.modify(computer_id_slot.registered_name, computer_id_slot.assignment, computer_id_slot.get_trim_assignment()) - if(user) - if(!issilicon(user) && in_range(src, user)) - user.put_in_hands(computer_id_slot) - balloon_alert(user, "removed ID") - to_chat(user, span_notice("You remove the card from the card slot.")) + if(user && !issilicon(user) && in_range(src, user)) + user.put_in_hands(computer_id_slot) else computer_id_slot.forceMove(drop_location()) computer_id_slot = null playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + balloon_alert(user, "removed ID") + to_chat(user, span_notice("You remove the card from the card slot.")) if(ishuman(loc)) var/mob/living/carbon/human/human_wearer = loc