shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3727 from Citadel-Station-13/upstream-merge-32196

Browse Source 
[MIRROR] Nerfs smoke machine + improves grammar
This commit is contained in:
LetterJay
2017-11-01 01:43:21 -04:00
committed by GitHub
parent f30c4629dc 82440ee3fd
commit 0adcd7eb61
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/smoke_machine.dm
+4 -4
View File
@@ -1,6 +1,6 @@
/obj/machinery/smoke_machine /obj/machinery/smoke_machine
name = "Smoke Machine" name = "smoke machine"
desc = "Seriously man?" desc = "A machine with a centrifuge installed into it. It produces smoke with any reagents you put into the machine."
icon = 'icons/obj/chemical.dmi' icon = 'icons/obj/chemical.dmi'
icon_state = "smoke0" icon_state = "smoke0"
density = TRUE density = TRUE
@@ -11,9 +11,9 @@
var/cooldown = 0 var/cooldown = 0
var/screen = "home" var/screen = "home"
var/useramount = 30 // Last used amount var/useramount = 30 // Last used amount
var/volume = 1000 var/volume = 300
var/setting = 3 var/setting = 3
var/list/possible_settings = list(3,6,9,12,15) var/list/possible_settings = list(3,6,9)
/datum/effect_system/smoke_spread/chem/smoke_machine/set_up(datum/reagents/carry, setting = 3, efficiency = 10, loc) /datum/effect_system/smoke_spread/chem/smoke_machine/set_up(datum/reagents/carry, setting = 3, efficiency = 10, loc)
amount = setting amount = setting