Removes mass-spectrometers

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

@@ -2,10 +2,8 @@
 /*
 CONTAINS:
 T-RAY
-DETECTIVE SCANNER
 HEALTH ANALYZER
 GAS ANALYZER
-MASS SPECTROMETER
 
 */
 /obj/item/device/t_scanner
@@ -395,6 +393,7 @@ MASS SPECTROMETER
 		to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")
 
 
+<<<<<<< HEAD
 /obj/item/device/mass_spectrometer
 	desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
 	name = "mass-spectrometer"
@@ -458,6 +457,8 @@ MASS SPECTROMETER
 	details = 1
 	origin_tech = "magnets=4;biotech=3;plasmatech=3"
 
+=======
+>>>>>>> 81fb344... Removes mass-spectrometers (#32965)
 /obj/item/device/slime_scanner
 	name = "slime scanner"
 	desc = "A device that analyzes a slime's internal composition and measures its stats."

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -188,7 +188,6 @@
 	new /obj/item/clothing/suit/armor/vest/det_suit(src)
 	new /obj/item/storage/belt/holster/full(src)
 	new /obj/item/pinpointer/crew(src)
-	new /obj/item/device/mass_spectrometer(src)
 
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections"

code/modules/research/designs/medical_designs.dm

@@ -2,6 +2,7 @@
 ////////////Medical Tools////////////////
 /////////////////////////////////////////
 
+<<<<<<< HEAD
 
 /datum/design/mass_spectrometer
 	name = "Mass-Spectrometer"
@@ -23,6 +24,8 @@
 	build_path = /obj/item/device/mass_spectrometer/adv
 	category = list("Medical Designs")
 
+=======
+>>>>>>> 81fb344... Removes mass-spectrometers (#32965)
 /datum/design/mmi
 	name = "Man-Machine Interface"
 	desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."