From b95da0a5a234a6fd03c960956c76920aba649f0b Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Thu, 2 Apr 2026 14:53:49 +0200
Subject: [PATCH] Fixes id cards being stuck in RFID removed from modular
 computers (#22132)

When the RFID slot is removed from a modular computer, it now ejects the
id card in it. This occurs for example when it is destroyed by various
means.

---------

Signed-off-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Co-authored-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
---
 .../computers/modular_computer/hardware.dm                  | 1 +
 html/changelogs/PDAFix.yml                                  | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 html/changelogs/PDAFix.yml

diff --git a/code/modules/modular_computers/computers/modular_computer/hardware.dm b/code/modules/modular_computers/computers/modular_computer/hardware.dm
index 7530551ba81..eb2e8e26bbb 100644
--- a/code/modules/modular_computers/computers/modular_computer/hardware.dm
+++ b/code/modules/modular_computers/computers/modular_computer/hardware.dm
@@ -112,6 +112,7 @@
 		nano_printer = null
 		found = TRUE
 	else if(card_slot == H)
+		astype(H, /obj/item/computer_hardware/card_slot)?.eject_id()
 		card_slot = null
 		found = TRUE
 	else if(battery_module == H)
diff --git a/html/changelogs/PDAFix.yml b/html/changelogs/PDAFix.yml
new file mode 100644
index 00000000000..d7f0a398c64
--- /dev/null
+++ b/html/changelogs/PDAFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Made the RFID card slot eject ID cards when removed from a pda, such as when a pda explodes."