Merge pull request #10499 from Hatterhat/tg-40046

more /tg/station ports - tools! logging! some other fun stuff!
2020-01-15 01:05:36 +01:00
parent a5aebcd6ff 464b893790
commit 8a06f2f45c
16 changed files with 520 additions and 333 deletions
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -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