Merge pull request #4479 from Citadel-Station-13/upstream-merge-33703

[MIRROR] Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
This commit is contained in:
LetterJay
2017-12-21 04:58:06 -06:00
committed by GitHub
@@ -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."