Skip to content

Commit 54c0f5a

Browse files
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: Co-authored-by: SapphoQueer <[email protected]>
1 parent 0ec4335 commit 54c0f5a

File tree

1 file changed

+4
-5
lines changed
  • code/modules/modular_computers/computers/item

1 file changed

+4
-5
lines changed

code/modules/modular_computers/computers/item/computer.dm

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,16 +277,15 @@
277277
if(crew_manifest_update)
278278
GLOB.manifest.modify(computer_id_slot.registered_name, computer_id_slot.assignment, computer_id_slot.get_trim_assignment())
279279

280-
if(user)
281-
if(!issilicon(user) && in_range(src, user))
282-
user.put_in_hands(computer_id_slot)
283-
balloon_alert(user, "removed ID")
284-
to_chat(user, span_notice("You remove the card from the card slot."))
280+
if(user && !issilicon(user) && in_range(src, user))
281+
user.put_in_hands(computer_id_slot)
285282
else
286283
computer_id_slot.forceMove(drop_location())
287284

288285
computer_id_slot = null
289286
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
287+
balloon_alert(user, "removed ID")
288+
to_chat(user, span_notice("You remove the card from the card slot."))
290289

291290
if(ishuman(loc))
292291
var/mob/living/carbon/human/human_wearer = loc

0 commit comments

Comments
 (0)