From e3a3082596b3d925a30f1d9a5037ef2151bad4e1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 21 Dec 2017 01:46:19 -0500 Subject: [PATCH 1/2] Merge pull request #33703 from kevinz000/patch-407 Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke --- .../integrated_electronics/subtypes/reagents.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 78b1e9682e..952015039c 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -1,3 +1,5 @@ +#define IC_SMOKE_REAGENTS_MINIMUM_UNITS 10 + /obj/item/integrated_circuit/reagent category_text = "Reagent" resistance_flags = UNACIDABLE | FIRE_PROOF @@ -8,8 +10,6 @@ if(volume) create_reagents(volume) - - /obj/item/integrated_circuit/reagent/smoke name = "smoke generator" desc = "Unlike most electronics, creating smoke is completely intentional." @@ -44,6 +44,8 @@ push_data() /obj/item/integrated_circuit/reagent/smoke/do_work() + if(!reagents || (reagents.total_volume < IC_SMOKE_REAGENTS_MINIMUM_UNITS)) + return var/location = get_turf(src) var/datum/effect_system/smoke_spread/chem/S = new S.attach(location) @@ -54,11 +56,9 @@ notified = TRUE S.start() - if(reagents) - reagents.clear_reagents() + reagents.clear_reagents() activate_pin(2) - /obj/item/integrated_circuit/reagent/injector name = "integrated hypo-injector" desc = "This scary looking thing is able to pump liquids into whatever it's pointed at."