shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wounds-part-2

Browse Source
This commit is contained in:
Timothy Teakettle
2020-08-02 18:11:07 +01:00
parent 03d01d917f a7ba1f0cb7
commit 289c186f32
84 changed files with 5111 additions and 4076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/cartridge.dm
+1
View File
@@ -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)