Merge remote-tracking branch 'origin/master' into TGUI-4

2020-08-04 09:31:34 +08:00
parent b30607b759 ec9f0d8919
commit 454baea55f
94 changed files with 5367 additions and 4268 deletions
@@ -10,6 +10,7 @@
 					/obj/item/cartridge/security = 10,
 					/obj/item/cartridge/janitor = 10,
 					/obj/item/cartridge/signal/toxins = 10,
+					/obj/item/cartridge/roboticist = 10,
 					/obj/item/pda/heads = 10)
 	premium = list(/obj/item/cartridge/captain = 2,
 					/obj/item/cartridge/quartermaster = 2)