fixes merge conflict

code/modules/research/designs/autolathe_designs.dm

@@ -543,6 +543,14 @@
 	build_path = /obj/item/assembly/health
 	category = list("initial", "Medical")
 
+/datum/design/stethoscope
+	name = "Stethoscope"
+	id = "stethoscope"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 500)
+	build_path = /obj/item/clothing/accessory/stethoscope
+	category = list("initial", "Medical")
+
 /datum/design/timer
 	name = "Timer"
 	id = "timer"

code/modules/research/designs/comp_board_designs.dm

@@ -272,6 +272,16 @@
 	build_path = /obj/item/circuitboard/solar_control
 	category = list("Computer Boards")
 
+/datum/design/sm_monitor
+	name = "Console Board (Supermatter Monitoring)"
+	desc = "Allows for the construction of circuit boards used to build a supermatter monitoring console"
+	id = "sm_monitor"
+	req_tech = list("programming" = 2, "powerstorage" = 2)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000)
+	build_path = /obj/item/circuitboard/sm_monitor
+	category = list("Computer Boards")
+
 /datum/design/spacepodlocator
 	name = "Console Board (Spacepod Locator)"
 	desc = "Allows for the construction of circuit boards used to build a space-pod locating console"

code/modules/research/designs/mechfabricator_designs.dm

@@ -751,7 +751,7 @@
 	category = list("Exosuit Equipment")
 
 /datum/design/mech_mining_scanner
-	name = "Exosuit Engineering Equipement (Mining Scanner)"
+	name = "Exosuit Engineering Equipment (Mining Scanner)"
 	id = "mech_mscanner"
 	build_type = MECHFAB
 	build_path = /obj/item/mecha_parts/mecha_equipment/mining_scanner

code/modules/research/experimentor.dm

@@ -291,8 +291,7 @@
 			for(var/turf/T in oview(1, src))
 				if(!T.density)
 					if(prob(EFFECT_PROB_VERYHIGH))
-						var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
-						reagentdecal.reagents.add_reagent("radium", 7)
+						new /obj/effect/decal/cleanable/greenglow(T)
 		if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
 			var/savedName = "[exp_on]"
 			ejectItem(TRUE)

code/modules/research/xenobiology/xenobiology.dm

@@ -198,7 +198,7 @@
 	being_used = 1
 
 	var/ghostmsg = "Play as [SM.name], pet of [user.name]?"
-	var/list/candidates = pollCandidates(ghostmsg, ROLE_SENTIENT, 0, 100)
+	var/list/candidates = SSghost_spawns.poll_candidates(ghostmsg, ROLE_SENTIENT, FALSE, 10 SECONDS, source = M)
 
 	if(!src)
 		return