Merge branch 'master' into upstream-merge-12630

This commit is contained in:
Nadyr
2022-04-04 18:47:50 -04:00
committed by GitHub
143 changed files with 66529 additions and 35937 deletions
+1 -1
View File
@@ -379,4 +379,4 @@
name = "Remmi Aerostat - Z1 Aerostat"
desc = "The Virgo 2 Aerostat away mission."
mappath = 'maps/expedition_vr/aerostat/aerostat.dmm'
associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat
associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat