cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-05

Browse Source
This commit is contained in:
Roxy
2025-11-05 19:43:07 -05:00
parent 7ebdda5853 7e6a7978c3
commit d0ca474789
461 changed files with 41708 additions and 37517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/UpdatePaths/Scripts/93517_VendATray_BoardRemove.txt
+1
View File
@@ -0,0 +1 @@
/obj/item/circuitboard/machine/vendatray : @DELETE
tools/UpdatePaths/Scripts/93676_jetpack_repaths.txt
+7
View File
@@ -0,0 +1,7 @@
/obj/item/tank/jetpack/oxygen : /obj/item/tank/jetpack{@OLD}
/obj/item/tank/jetpack/oxygen/harness : /obj/item/tank/jetpack/harness{@OLD}
/obj/item/tank/jetpack/oxygen/captain : /obj/item/tank/jetpack/captain{@OLD}
/obj/item/tank/jetpack/oxygen/security : /obj/item/tank/jetpack/security{@OLD}
tools/UpdatePaths/Scripts/93704_monitored_area_refactor.txt
+13
View File
@@ -0,0 +1,13 @@
/area/station/ai_monitored/command/nuke_storage/@SUBTYPES : /area/station/command/vault/@SUBTYPES{@OLD}
/area/station/ai_monitored/command/storage/eva/@SUBTYPES : /area/station/command/eva/@SUBTYPES{@OLD}
/area/station/ai_monitored/security/armory/@SUBTYPES : /area/station/security/armory/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/ai_upload/@SUBTYPES : /area/station/ai/upload/chamber/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/ai_upload_foyer/@SUBTYPES : /area/station/ai/upload/foyer/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/ai/@SUBTYPES : /area/station/ai/satellite/chamber/@SUBTYPES{@OLD}
/area/station/ai_monitored/aisat/exterior/@SUBTYPES : /area/station/ai/satellite/exterior/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/aisat/maint/@SUBTYPES : /area/station/ai/satellite/maintenance/@SUBTYPES{@OLD}
/area/station/ai_monitored/command/storage/satellite/@SUBTYPES : /area/station/ai/satellite/maintenance/storage/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/aisat/@SUBTYPES : /area/station/ai/satellite/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/aisat_interior/@SUBTYPES : /area/station/ai/satellite/interior/@SUBTYPES{@OLD}
/area/station/ai_monitored/turret_protected/ai_sat_ext_as/@SUBTYPES : /area/station/ai/exterior{@OLD}
/area/station/ai_monitored/turret_protected/ai_sat_ext_ap/@SUBTYPES : /area/station/ai/exterior{@OLD}