From 09efeaea5ce1fac7f4e916a3abc380fcf5fe52ae Mon Sep 17 00:00:00 2001 From: Chinsky Date: Tue, 17 Dec 2013 22:32:23 +0400 Subject: [PATCH 1/2] Fixed detective semiauto turning wrong caliber when screwdrived. --- code/modules/projectiles/guns/projectile/revolver.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index b6a305cbf73..0b3145cb9a5 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -54,7 +54,7 @@ caliber = "357" desc = "The barrel and chamber assembly seems to have been modified." user << "You reinforce the barrel of [src]! Now it will fire .357 rounds." - else + else if (caliber == "357") user << "You begin to revert the modifications to [src]." if(loaded.len) afterattack(user, user) //and again From 19c83de6af5e9ddc556dcdff5e72897581b064c8 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sun, 22 Dec 2013 07:55:03 +0400 Subject: [PATCH 2/2] Applying Minifix to Yinaderp ID of resulting chemical was not set, so reagents just disappeared --- code/modules/reagents/Chemistry-Recipes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index bb168446d56..d9b6b7e2301 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -477,14 +477,14 @@ datum potassium_chloride name = "Potassium Chloride" id = "potassium_chloride" - id = "potassium_chloride" + result = "potassium_chloride" required_reagents = list("sodiumchloride" = 1, "potassium" = 1) result_amount = 2 potassium_chlorophoride name = "Potassium Chlorophoride" id = "potassium_chlorophoride" - id = "potassium_chlorophoride" + result = "potassium_chlorophoride" required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloral_hydrate" = 1) result_amount = 4