cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into updates_the_nbt

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
This commit is contained in:
alberyk
2022-02-19 10:26:35 -03:00
parent 32601c50bf 82969930ff
commit 12a70b50b7
149 changed files with 2287 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/garbage-debug.dm
+1
View File
@@ -380,6 +380,7 @@
SearchVar(SSpipenet)
SearchVar(SSprocessing)
SearchVar(SSshuttle)
SearchVar(SSmapping)
SearchVar(base_law_type)
SearchVar(discord_bot)
SearchVar(diseases)