Merge branch 'master' into glassware

2020-01-23 13:31:04 -05:00
parent 181984f478 14a33ee7dc
commit 9466b0f4ca
554 changed files with 19713 additions and 12833 deletions
@@ -199,6 +199,9 @@
 	amount_per_transfer_from_this = 5
 	list_reagents = list(/datum/reagent/consumable/condensedcapsaicin = 40)

+/obj/item/reagent_containers/spray/pepper/empty // for techfab printing
+	list_reagents = null
+
 /obj/item/reagent_containers/spray/pepper/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins huffing \the [src]! It looks like [user.p_theyre()] getting a dirty high!</span>")
 	return OXYLOSS