From f089b9ca2dfadc4c7ab17aed04a955f9158af526 Mon Sep 17 00:00:00 2001 From: ACCount Date: Tue, 28 Nov 2017 15:19:08 +0300 Subject: [PATCH] Removes mass-spectrometers --- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 2 -- _maps/map_files/BoxStation/BoxStation.dmm | 1 - _maps/map_files/MetaStation/MetaStation.dmm | 1 - _maps/shuttles/whiteship_meta.dmm | 1 - code/game/objects/items/devices/scanners.dm | 5 +++-- .../structures/crates_lockers/closets/secure/security.dm | 1 - code/modules/research/designs/medical_designs.dm | 3 +++ 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index ab39bb14df..a5b3c5b9c7 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -1488,8 +1488,6 @@ /area/ruin/space/has_grav/deepstorage/armory) "db" = ( /obj/structure/table, -/obj/item/device/mass_spectrometer/adv, -/obj/item/device/mass_spectrometer/adv, /obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer, /obj/item/stack/medical/gauze, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 39fa8179cd..b630c327cf 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -56944,7 +56944,6 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/device/mass_spectrometer, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "Qnn" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 34757316a1..f0f8fa160c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -74121,7 +74121,6 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/device/mass_spectrometer, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cXL" = ( diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 4ac62717c0..96f6e7e3b4 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1134,7 +1134,6 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/device/mass_spectrometer, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bW" = ( diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index bc99a28eea..a9ab066744 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/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, "Temperature: [round(environment.temperature-T0C)] °C") +<<<<<<< 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." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 04e624a46b..3cb3edb8c2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/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" diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 89767a1c55..80bf47cc14 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/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."