TGS Test Merge (#6068)

code/__DEFINES/spans.dm

@@ -15,6 +15,8 @@
 #define SPAN_ALERTSYNDIE(str) ("<span class='alertsyndie'>[str]</span>")
 #define SPAN_ALERTWARNING(str) ("<span class='alertwarning'>[str]</span>")
 #define SPAN_ALIEN(str) ("<span class='alien'>[str]</span>")
+#define SPAN_ALLOY(str) ("<span class = 'alloy'>[str]</span>")
+#define SPAN_ALLOYH(str) ("<span class = 'heavy_alloy'>[str]</span>")
 #define SPAN_ANNOUNCE(str) ("<span class='announce'>[str]</span>")
 #define SPAN_BIG(str) ("<span class='big'>[str]</span>")
 #define SPAN_BIGICON(str) ("<span class='bigicon'>[str]</span>")
@@ -27,6 +29,10 @@
 #define SPAN_BOLDNICEGREEN(str) ("<span class='boldnicegreen'>[str]</span>")
 #define SPAN_BOLDNOTICE(str) ("<span class='boldnotice'>[str]</span>")
 #define SPAN_BOLDWARNING(str) ("<span class='boldwarning'>[str]</span>")
+#define SPAN_BRASS(str) ("<span class = 'brass'>[str]</span>")
+#define SPAN_BRASSH(str) ("<span class = 'heavy_brass'>[str]</span>")
+#define SPAN_BRASSL(str) ("<span class = 'large_brass'>[str]</span>")
+#define SPAN_BRASSBIG(str) ("<span class = 'big_brass'>[str]</span>")
 #define SPAN_CAUTION(str) ("<span class='caution'>[str]</span>")
 #define SPAN_CENTCOMRADIO(str) ("<span class='centcomradio'>[str]</span>")
 #define SPAN_CHANGELING(str) ("<span class='changeling'>[str]</span>")
@@ -70,6 +76,8 @@
 #define SPAN_HOLOPARASITE(str) ("<span class='holoparasite'>[str]</span>")
 #define SPAN_HYPNOPHRASE(str) ("<span class='hypnophrase'>[str]</span>")
 #define SPAN_ICON(str) ("<span class='icon'>[str]</span>")
+#define SPAN_INATHNEQ(str) ("<span class = 'inathneq'>[str]</span>")
+#define SPAN_INATHNEQL(str) ("<span class = 'inathneq_large'>[str]</span>")
 #define SPAN_INFO(str) ("<span class='info'>[str]</span>")
 #define SPAN_INFOPLAIN(str) ("<span class='infoplain'>[str]</span>")
 #define SPAN_INTERFACE(str) ("<span class='interface'>[str]</span>")
@@ -87,6 +95,12 @@
 #define SPAN_NAME(str) ("<span class='name'>[str]</span>")
 #define SPAN_NARSIE(str) ("<span class='narsie'>[str]</span>")
 #define SPAN_NARSIESMALL(str) ("<span class='narsiesmall'>[str]</span>")
+#define SPAN_NEOVGRE(str) ("<span class = 'neovgre'> [str]</span>")
+#define SPAN_NEOVGREL(str) ("<span class = 'neovgre_large'> [str]</span>")
+#define SPAN_NEZBERE(str) ("<span class = 'nezbere'>[str]</span>")
+#define SPAN_NEZBIG(str) ("<span class = 'nezbere_large'>[str]</span>")
+#define SPAN_NZCRENTR(str) ("<span class = 'nzcrentr'>[str]</span>")
+#define SPAN_NZCRENTRL(str) ("<span class = 'nzcrentr_large'>[str]</span>")
 #define SPAN_NICEGREEN(str) ("<span class='nicegreen'>[str]</span>")
 #define SPAN_NOTICE(str) ("<span class='notice'>[str]</span>")
 #define SPAN_NOTICEALIEN(str) ("<span class='noticealien'>[str]</span>")
@@ -96,6 +110,7 @@
 #define SPAN_PREFIX(str) ("<span class='prefix'>[str]</span>")
 #define SPAN_PURPLE(str) ("<span class='purple'>[str]</span>")
 #define SPAN_RADIO(str) ("<span class='radio'>[str]</span>")
+#define SPAN_RATVAR(str) ("<span class = 'ratvar'> [str]</span>")
 #define SPAN_REALLYBIG(str) ("<span class='reallybig'>[str]</span>")
 #define SPAN_RED(str) ("<span class='red'>[str]</span>")
 #define SPAN_REDTEAMRADIO(str) ("<span class='redteamradio'>[str]</span>")

code/datums/recipe/crafting_recipes/recipes_misc.dm

@@ -304,6 +304,21 @@
 	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,14 @@
 	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 = 'icons/obj/clockwork.dmi'
+	icon_state = "multitool"
+	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,14 @@
 	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 = 'icons/obj/clockwork.dmi'
+	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,15 @@
 	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 = 'icons/obj/clockwork.dmi'
+	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,28 @@
 		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 vaguely familiar.</span>"
+	icon = 'icons/obj/clockwork.dmi'
+	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 harms the unprotected eye. <span class = 'nezbere_small'>A masterpiece.</span>"
+	icon = 'icons/obj/clockwork.dmi'
+	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,14 @@
 	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'>As sharp as the day they left the forge.</span>"
+	icon = 'icons/obj/clockwork.dmi'
+	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,15 @@
 	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 = 'icons/obj/clockwork.dmi'
+	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