Merge branch 'master' into modsuits

This commit is contained in:
Jerry Wester
2022-12-13 19:18:24 -07:00
committed by GitHub
57 changed files with 454 additions and 273 deletions
+1 -1
View File
@@ -40,7 +40,7 @@
/obj/machinery/computer/cargo/Destroy()
QDEL_NULL(radio)
..()
return ..()
/obj/machinery/computer/cargo/proc/get_export_categories()
. = EXPORT_CARGO