Merge branch 'master' into weapon-removal

This commit is contained in:
Guti
2024-09-18 18:07:43 +02:00
482 changed files with 5086 additions and 35138 deletions
@@ -310,7 +310,7 @@
if(istype(I,/obj/item/card/id))
if(!powered())
return
else if(!inserted_id && user.unEquip(I))
else if(!inserted_id && (user.unEquip(I) || isrobot(user)))
I.forceMove(src)
inserted_id = I
tgui_interact(user)