Merge branch 'master' into master

This commit is contained in:
Thalpy
2019-06-17 12:18:40 +01:00
committed by GitHub
121 changed files with 3642 additions and 904 deletions
@@ -9,7 +9,6 @@
interaction_flags_machine = INTERACT_MACHINE_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE
resistance_flags = FIRE_PROOF | ACID_PROOF
circuit = /obj/item/circuitboard/machine/chem_dispenser
var/cell_type = /obj/item/stock_parts/cell/high
var/obj/item/stock_parts/cell/cell
var/powerefficiency = 0.1
var/amount = 30
@@ -79,7 +78,6 @@
/obj/machinery/chem_dispenser/Initialize()
. = ..()
cell = new cell_type
dispensable_reagents = sortList(dispensable_reagents)
update_icon()