TGS Test Merge (#6068)

code/datums/recipe/crafting_recipes/recipes_misc.dm

@@ -304,6 +304,20 @@
 	subcategory = CAT_TOOL
 	category = CAT_MISCELLANEOUS
 
+/datum/crafting_recipe/clockwelder
+	name = "Replica Clockwork Welding Tool"
+	tools = list(/obj/item/cell/high,
+				/obj/item/reagent_containers/glass/beaker)
+	result = /obj/item/weldingtool/experimental/brass
+	reqs = list(/obj/item/weldingtool/experimental = 1,
+				/obj/item/stack/cable_coil = 20,
+				/obj/item/stack/material/brass = 5,
+				/datum/reagent/water = 25)
+	time = 40
+	//always_available = FALSE
+	subcategory = CAT_TOOL
+	category = CAT_MISCELLANEOUS
+
 /datum/crafting_recipe/brass_wirecutters
 	name = "Brass Wirecutters"
 	tools = list(/obj/item/cell/high,

code/datums/wires/wires.dm

@@ -219,7 +219,7 @@
 	// if(user.can_admin_interact())
 		// return TRUE
 	var/obj/item/I = user.get_active_held_item()
-	if(istype(I, /obj/item/multitool/alien))
+	if(istype(I, /obj/item/multitool/alien) || istype(I, /obj/item/multitool/clockwork))
 		return TRUE
 	return FALSE
 

code/game/objects/items/devices/multitool.dm

@@ -113,6 +113,13 @@
 	origin_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 5)
 	colorable = 0
 
+/obj/item/multitool/clockwork
+	name = "clockwork multitool"
+	desc = "A slender brass device, adorned with three prongs pulsing with energy, a faintly glowing red gem, and a screen in the shape of an eye. <span class = 'nzcrentr_small'>It almost looks bored.</span>"
+	icon_state = "clockitool"
+	tool_speed = 0.1
+	colorable = 0
+
 //Colored Variants
 /obj/item/multitool/red
 	color_overlay = "multi_r"

code/game/objects/items/tools/crowbar.dm

@@ -42,6 +42,13 @@
 	icon_state = "crowbar_brass"
 	tool_speed = 0.75
 
+/obj/item/tool/crowbar/clockwork
+	name = "clockwork crowbar"
+	desc = "An engraved piece of compressed brass, capable of prying things up and open with un-natural ease. <span class = 'brass'> It feels frigid to the touch. </span>"
+	icon_state = "crowbar_clock"
+	tool_sound = 'sound/magic/clockwork/fellowship_armory.ogg'
+	tool_speed = 0.1
+
 /datum/category_item/catalogue/anomalous/precursor_a/alien_crowbar
 	name = "Precursor Alpha Object - Hard Light Pry Tool"
 	desc = "An object which bears striking resemblence to the common crowbar. \

code/game/objects/items/tools/screwdriver.dm

@@ -82,6 +82,14 @@
 	tool_speed = 0.75
 	random_color = FALSE
 
+/obj/item/tool/screwdriver/clockwork
+	name = "clockwork screwdriver"
+	desc = "An all-brass screwdriver with a <span class = 'nezbere_small'>vaugely shifting tip.</span> Seems to always fit any screw channel it is placed in."
+	icon_state = "screwdriver_clock"
+	tool_sound = 'sound/machines/clockcult/integration_cog_install.ogg'
+	tool_speed = 0.1
+	random_color = FALSE
+
 /datum/category_item/catalogue/anomalous/precursor_a/alien_screwdriver
 	name = "Precursor Alpha Object - Hard Light Torgue Tool"
 	desc = "This appears to be a tool, with a solid handle, and a thin hard light \

code/game/objects/items/tools/weldingtool.dm

@@ -447,6 +447,26 @@
 		nextrefueltick = world.time + 10
 		reagents.add_reagent("fuel", 1)
 
+/obj/item/weldingtool/experimental/brass
+	name = "replica clockwork welding tool"
+	desc = "A re-engineered experimental welder. It sports anti-corrosive brass fittings, and a further refined fuel system.<span class = 'heavy_brass'> It feels vaugely familiar.</span>"
+	icon_state = "clockwelder"
+	max_fuel = 50
+	tool_speed = 0.4
+	flame_color = "#990000" // deep red, as the sprite shows
+	change_icons = 0
+
+/obj/item/weldingtool/experimental/clockwork
+	name = "clockwork welding tool"
+	desc = "An antique welding tool, adorned with brass, and a brilliant red gem as the fuel tank. It neither runs out of fuel, nor hurts the unprotected eye. <span class = 'nezbere_small'>A masterpiece.</span>"
+	icon_state = "clockwelder"
+	max_fuel = 100
+	eye_safety_modifier = 2
+	tool_sound = 'sound/machines/clockcult/steam_whoosh.ogg'
+	tool_speed = 0.1
+	flame_color = "#990000" // deep red, as above, so below
+	change_icons = 0
+
 /obj/item/weldingtool/experimental/hybrid
 	name = "strange welding tool"
 	desc = "An experimental welder capable of synthesizing its own fuel from spatial waveforms. It's like welding with a star!"

code/game/objects/items/tools/wirecutters.dm

@@ -66,6 +66,13 @@
 	tool_speed = 0.75
 	random_color = FALSE
 
+/obj/item/tool/wirecutters/clockwork
+	name = "clockwork wirecutters"
+	desc = "An antiquated pair of wirecutters, fashioned out of extremely dense brass.<span class = 'nezbere_small'>As sharp as the day they left the forge.</span>"
+	icon_state = "cutters_clock"
+	tool_speed = 0.1
+	random_color = FALSE
+
 /datum/category_item/catalogue/anomalous/precursor_a/alien_wirecutters
 	name = "Precursor Alpha Object - Wire Seperator"
 	desc = "An object appearing to have a tool shape. It has two handles, and two \

code/game/objects/items/tools/wrench.dm

@@ -59,6 +59,14 @@
 	tool_speed = 0.75
 	random_color = FALSE
 
+/obj/item/tool/wrench/clockwork
+	name = "clockwork wrench"
+	desc = "A wrench cast completely out of brass, with a head that perfectly affixes to anything it's braced around. <span class = 'brass'>The handle thrums faintly in your hand.</span>"
+	icon_state = "wrench_clock"
+	tool_sound = 'sound/machines/clockcult/integration_cog_install.ogg'
+	tool_speed = 0.1
+	random_color = FALSE
+
 /obj/item/tool/wrench/cyborg
 	name = "automatic wrench"
 	desc = "An advanced robotic wrench. Can be found in industrial synthetic shells."

code/game/objects/random/misc.dm

@@ -57,6 +57,19 @@
 				/obj/item/stack/cable_coil/alien,
 				/obj/item/multitool/alien)
 
+/obj/random/tool/clockwork
+	name = "random clockwork tool"
+	desc = "This is a random clockwork tool"
+	icon_state = "clockwelder"
+
+/obj/random/tool/clockwork/item_to_spawn()
+	return pick (/obj/item/tool/screwdriver/clockwork,
+				/obj/item/tool/wirecutters/clockwork,
+				/obj/item/weldingtool/experimental/clockwork,
+				/obj/item/tool/crowbar/clockwork,
+				/obj/item/tool/wrench/clockwork,
+				/obj/item/multitool/clockwork)
+
 /obj/random/technology_scanner
 	name = "random scanner"
 	desc = "This is a random technology scanner."
@@ -975,6 +988,7 @@
 				prob(2);/obj/random/multiple/minevault,
 				prob(1);/obj/random/coin,
 				prob(1);/obj/random/drinkbottle,
+				prob(1);/obj/random/tool/clockwork,
 				prob(1);/obj/random/tool/alien)
 
 /obj/random/slimecore