Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598

[MIRROR] Smoke Machine Updates & Fixes
This commit is contained in:
LetterJay
2017-10-14 10:21:09 -04:00
committed by GitHub
6 changed files with 19 additions and 5 deletions
@@ -1,5 +1,6 @@
/obj/machinery/smoke_machine
name = "Smoke Machine"
desc = "Seriously man?"
icon = 'icons/obj/chemical.dmi'
icon_state = "smoke0"
density = TRUE
@@ -20,6 +21,11 @@
carry.remove_any(setting * 16 / efficiency)
location = loc
/datum/effect_system/smoke_spread/chem/smoke_machine
effect_type = /obj/effect/particle_effect/smoke/transparent
/obj/machinery/smoke_machine/Initialize()
. = ..()
create_reagents(volume)
@@ -64,7 +70,8 @@
to_chat(user, "<span class='notice'>You transfer [units] units of the solution to [src].</span>")
add_logs(usr, src, "has added [english_list(RC.reagents.reagent_list)] to [src]")
return
if(default_unfasten_wrench(user, I))
if(default_unfasten_wrench(user, I, 40))
on = FALSE
return
return ..()