Merge remote-tracking branch 'upstream/master' into cool-ipcs

2020-09-16 05:12:20 +01:00
parent 0d8374a328 604020c4bc
commit 12bf3aebda
635 changed files with 23608 additions and 12861 deletions
@@ -80,3 +80,8 @@
 	data["npcs"] = npcs

 	return data
+	
+/datum/orbit_menu/ui_assets()
+	. = ..() || list()
+	. += get_asset_datum(/datum/asset/simple/orbit)
+