Cleans up unused code

code/modules/research/designs/mechfabricator_designs.dm

@@ -191,16 +191,6 @@
 	construction_time = 130
 	category = list("Odysseus")
 
-/*/datum/design/odysseus_armor
-	name = "Exosuit Armor (\"Odysseus\")"
-	id = "odysseus_armor"
-	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/part/odysseus_armor
-	materials = list(MAT_METAL=15000)
-	construction_time = 200
-	category = list("Odysseus")
-	*/
-
 //Gygax
 /datum/design/gygax_chassis
 	name = "Exosuit Chassis (\"Gygax\")"

code/modules/research/experimentor.dm

@@ -43,6 +43,7 @@
 		temp_list[O] = text2num(temp_list[O])
 	return temp_list
 
+<<<<<<< HEAD
 /* //uncomment to enable forced reactions.
 /obj/machinery/r_n_d/experimentor/verb/forceReaction()
 	set name = "Force Experimentor Reaction"
@@ -56,6 +57,8 @@
 		if(loaded_item)
 			item_reactions["[loaded_item.type]"] = oldReaction
 */
+=======
+>>>>>>> b7a9a2a... Merge pull request #32844 from ShizCalev/code-cleanup
 
 /obj/machinery/r_n_d/experimentor/proc/SetTypeReactions()
 	var/probWeight = 0

code/modules/research/message_server.dm

@@ -98,8 +98,6 @@ GLOBAL_LIST_INIT(message_servers, list())
 	return newKey
 
 /obj/machinery/message_server/process()
-	//if(decryptkey == "password")
-	//	decryptkey = generateKey()
 	if(active && (stat & (BROKEN|NOPOWER)))
 		active = 0
 		return