From d43de80540f4bc7679ec8ef8c59054ac5266aa4c Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Tue, 17 Oct 2017 09:21:41 -0400
Subject: [PATCH 1/2] Corrects caravan ambush tool speed (#31792)

* Corrects caravan ambush tool speed

* subtype
---
 .../RandomRuins/SpaceRuins/caravanambush.dmm  | 28 +++----------------
 .../ruins/spaceruin_code/caravanambush.dm     | 27 ++++++++++++++++++
 tgstation.dme                                 |  1 +
 3 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 code/modules/ruins/spaceruin_code/caravanambush.dm

diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 2f395e4f1c..58af9d4919 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -735,30 +735,10 @@
 /area/ruin/powered)
 "cu" = (
 /obj/structure/closet/crate/secure/engineering,
-/obj/item/wrench{
-	color = "#ff0000";
-	desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster.";
-	name = "experimental wrench";
-	toolspeed = 3
-	},
-/obj/item/screwdriver{
-	color = "#ff0000";
-	desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster.";
-	name = "experimental screwdriver";
-	toolspeed = 3
-	},
-/obj/item/wirecutters{
-	color = "#ff0000";
-	desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster.";
-	name = "experimental wirecutters";
-	toolspeed = 3
-	},
-/obj/item/crowbar/red{
-	color = "#ff0000";
-	desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster.";
-	name = "experimental crowbar";
-	toolspeed = 3
-	},
+/obj/item/wrench/caravan,
+/obj/item/screwdriver/caravan,
+/obj/item/wirecutters/caravan,
+/obj/item/crowbar/red/caravan,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered)
 "cv" = (
diff --git a/code/modules/ruins/spaceruin_code/caravanambush.dm b/code/modules/ruins/spaceruin_code/caravanambush.dm
new file mode 100644
index 0000000000..8877a693cd
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/caravanambush.dm
@@ -0,0 +1,27 @@
+//caravan ambush
+
+/obj/item/wrench/caravan
+	color = "#ff0000"
+	desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster."
+	name = "experimental wrench"
+	toolspeed = 0.3
+
+/obj/item/screwdriver/caravan
+	color = "#ff0000"
+	desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster."
+	name = "experimental screwdriver"
+	toolspeed = 0.3
+	random_color = FALSE
+
+/obj/item/wirecutters/caravan
+	color = "#ff0000"
+	desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster."
+	name = "experimental wirecutters"
+	toolspeed = 0.3
+	random_color = FALSE
+
+/obj/item/crowbar/red/caravan
+	color = "#ff0000"
+	desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."
+	name = "experimental crowbar"
+	toolspeed = 0.3
diff --git a/tgstation.dme b/tgstation.dme
index f024eb5f68..4ebf07eafa 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2156,6 +2156,7 @@
 #include "code\modules\ruins\objects_and_mobs\sin_ruins.dm"
 #include "code\modules\ruins\spaceruin_code\asteroid4.dm"
 #include "code\modules\ruins\spaceruin_code\bigderelict1.dm"
+#include "code\modules\ruins\spaceruin_code\caravanambush.dm"
 #include "code\modules\ruins\spaceruin_code\crashedclownship.dm"
 #include "code\modules\ruins\spaceruin_code\crashedship.dm"
 #include "code\modules\ruins\spaceruin_code\deepstorage.dm"