Merge remote-tracking branch 'ParadiseSS13/master' into make_meth_less_op

This commit is contained in:
Kyep
2018-07-29 17:07:42 -07:00
82 changed files with 1847 additions and 1415 deletions
@@ -221,7 +221,7 @@
/datum/reagent/pyrosium
name = "Pyrosium"
id = "pyrosium"
description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly cools all other reagents in the mob down to 0K."
description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly heats all other reagents."
color = "#B20000" // rgb: 139, 166, 233
process_flags = ORGANIC | SYNTHETIC