Merge branch 'master' into aprilfools

This commit is contained in:
Heroman
2021-03-30 03:31:35 +10:00
26 changed files with 26373 additions and 26127 deletions
@@ -552,3 +552,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac
loc_network = "unkthree"
/obj/item/device/perfect_tele/frontier/unknown/four
loc_network = "unkfour"
/obj/item/device/perfect_tele/frontier/unknown/five
loc_network = "unkfive"
/obj/item/device/perfect_tele/frontier/unknown/six
loc_network = "unksix"