Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00
parent 63122795f9 8223692c32
commit dac6cc56e4
173 changed files with 8361 additions and 5643 deletions
@@ -57,6 +57,12 @@
 	unit_name = "lizard hide"
 	export_types = list(/obj/item/stack/sheet/animalhide/lizard)

+// Gondola hide. Mindbogglingly expensive.
+/datum/export/stack/skin/gondola
+	cost = 10000
+	unit_name = "gondola hide"
+	export_types = list(/obj/item/stack/sheet/animalhide/gondola)
+
 // Alien hide. Extremely expensive.
 /datum/export/stack/skin/xeno
 	cost = 3000
@@ -1648,7 +1648,8 @@
 	                /obj/item/stack/tile/fakespace/loaded,
 	                /obj/item/gun/ballistic/shotgun/toy/crossbow,
 	                /obj/item/toy/redbutton,
-					/obj/item/toy/eightball)
+					/obj/item/toy/eightball,
+					/obj/item/vending_refill/donksoft)
 	crate_name = "toy crate"

 /datum/supply_pack/misc/autodrobe