From fc7dbc8322ef2f11e6041fab5f8ba09e21bac8fc Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 16 Feb 2018 11:31:52 -0500 Subject: [PATCH 1/2] Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition Removes secondary --- code/modules/reagents/chemistry/recipes.dm | 1 - code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index 9e73f12f10..a4167a19df 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -9,7 +9,6 @@ var/atom/required_container = null // the container required for the reaction to happen var/required_other = 0 // an integer required for the reaction to happen - var/secondary = 0 // set to nonzero if secondary reaction var/mob_react = TRUE //Determines if a chemical reaction can occur inside a mob var/required_temp = 0 diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index a430d93fba..0fa4ddd479 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -268,7 +268,6 @@ id = "smoke_powder_smoke" required_reagents = list("smoke_powder" = 1) required_temp = 374 - secondary = 1 mob_react = FALSE /datum/chemical_reaction/smoke_powder_smoke/on_reaction(datum/reagents/holder, created_volume)