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

This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
313 changed files with 6548 additions and 4624 deletions
@@ -156,3 +156,6 @@
else if(cyborg.cell.charge <= 0)
balloon_alert(user, "not enough energy!")
return
/obj/item/airlock_painter/decal/cyborg/click_alt(mob/user)
return CLICK_ACTION_BLOCKING