Merge remote-tracking branch 'upstream/master' into xenoarch-new

modular_splurt/code/modules/research/designs/misc_designs.dm

@@ -1,2 +1,19 @@
 /datum/design/light_replacer_blue/New()
 	departmental_flags |= DEPARTMENTAL_FLAG_SCIENCE
+	. = ..()
+
+/datum/design/bluespacespray/New()
+	departmental_flags |= DEPARTMENTAL_FLAG_SERVICE
+	. = ..()
+
+
+/datum/design/ultimatespray
+	name = "Ultimate Spray"
+	desc = "The ultimate sprayer, no mess shall go unclean today."
+	id = "ultimatespray"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 2250, /datum/material/glass = 2250, /datum/material/plasma = 2250, /datum/material/diamond = 370, /datum/material/bluespace = 370)
+	build_path = /obj/item/reagent_containers/spray/ultimate
+	reagents_list = list(/datum/reagent/liquid_dark_matter = 10)
+	category = list("Misc", "Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE

modular_splurt/code/modules/research/techweb/nodes/janitor_nodes.dm

@@ -0,0 +1,7 @@
+/datum/techweb_node/ultispray
+	id = "ultispray"
+	display_name = "Alien Janitoring"
+	description = "Clean messes like Abductors clean up witnesses"
+	prereq_ids = list("alien_stockparts", "bspspray")
+	design_ids = list("ultimatespray")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)