Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2

This commit is contained in:
Spades
2016-10-04 16:06:18 -04:00
72 changed files with 776 additions and 284 deletions

View File

@@ -34,7 +34,7 @@ var/list/all_supply_groups = list("Atmospherics",
var/access = null
var/hidden = 0
var/contraband = 0
var/group = "Operations"
var/group = "Miscellaneous"
/datum/supply_packs/New()
manifest += "<ul>"