Merge branch 'master' into Ghommie-cit430

2019-12-05 20:53:14 -08:00
parent 5024e900f7 f937c4d877
commit 6b2d3b116d
113 changed files with 8456 additions and 6075 deletions
@@ -37,7 +37,15 @@
 		/obj/item/screwdriver,
 		/obj/item/valentine,
 		/obj/item/stamp,
-		/obj/item/key))
+		/obj/item/key,
+		/obj/item/cartridge,
+		/obj/item/camera_film,
+		/obj/item/stack/ore/bluespace_crystal,
+		/obj/item/reagent_containers/food/snacks/grown/poppy,
+		/obj/item/instrument/harmonica,
+		/obj/item/mining_voucher,
+		/obj/item/suit_voucher,
+		/obj/item/reagent_containers/pill))

 /obj/item/storage/wallet/Exited(atom/movable/AM)
 	. = ..()