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

This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
517 changed files with 24339 additions and 21253 deletions
@@ -0,0 +1,2 @@
/obj/item/circuitboard/machine/vending/donksnackvendor : @DELETE
/obj/item/circuitboard/machine/vending/donksofttoyvendor : @DELETE
@@ -0,0 +1,3 @@
/obj/machinery/atmospherics/components/unary/bluespace_sender : @DELETE
/obj/machinery/bluespace_vendor/@SUBTYPES : @DELETE
/obj/item/wallframe/bluespace_vendor_mount : @DELETE
@@ -0,0 +1 @@
/obj/machinery/computer/station_alert/station_only : /obj/machinery/computer/station_alert{@OLD}