cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

Browse Source
This commit is contained in:
Waterpig
2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/map_template.dm
+3
View File
@@ -167,7 +167,10 @@
// Cache for sonic speed
var/list/to_rebuild = SSair.adjacent_rebuild
<<<<<<< HEAD
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
// iterate over turfs in the border and clear them from active atmos processing
for(var/turf/border_turf as anything in CORNER_BLOCK_OFFSET(T, width + 2, height + 2, -1, -1))
SSair.remove_from_active(border_turf)