Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

This commit is contained in:
xPokee
2025-09-10 14:12:16 -04:00
277 changed files with 8854 additions and 7401 deletions
+2 -1
View File
@@ -192,6 +192,7 @@
set_wearer(user)
else if(wearer)
unset_wearer()
return ..()
/obj/item/mod/control/dropped(mob/user)
. = ..()
@@ -393,7 +394,7 @@
return cell
/obj/item/mod/control/GetAccess()
if(ai_controller)
if(ai_controller && req_access)
return req_access.Copy()
else
return ..()