From 13f303ce8144bac329001b9573060ee4ddd4bdac Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 24 Aug 2020 08:58:14 -0300 Subject: [PATCH] Removes mesons and material scanners from the station (#9726) --- code/datums/uplink/devices and tools.dm | 14 +++++++++- code/game/machinery/vending_types.dm | 4 +-- code/game/objects/random/random.dm | 6 +---- .../crates_lockers/closets/secure/cargo.dm | 1 - .../closets/secure/engineering.dm | 3 --- .../crates_lockers/closets/utility_closets.dm | 2 ++ code/modules/cargo/random_stock/t1_common.dm | 8 +----- .../preference_setup/loadout/loadout_eyes.dm | 27 ------------------- .../clothing/spacesuits/rig/suits/station.dm | 5 +--- code/modules/mining/machine_rigpress.dm | 3 --- code/modules/mining/machine_vending.dm | 1 - .../mob/living/silicon/robot/robot_modules.dm | 4 --- code/modules/power/singularity/singularity.dm | 2 +- .../designs/mechfab/hardsuit/modules.dm | 7 ----- .../designs/protolathe/hud_glasses_designs.dm | 6 ----- code/modules/research/xenoarchaeology/misc.dm | 1 - code/modules/supermatter/supermatter.dm | 4 +-- html/changelogs/alberyk-nomesons.yml | 7 +++++ maps/aurora/aurora-3_sublevel.dmm | 1 - maps/aurora/aurora-4_mainlevel.dmm | 15 ----------- maps/aurora/aurora-5_interstitial.dmm | 1 - maps/aurora/aurora-6_surface.dmm | 2 -- 22 files changed, 30 insertions(+), 94 deletions(-) create mode 100644 html/changelogs/alberyk-nomesons.yml diff --git a/code/datums/uplink/devices and tools.dm b/code/datums/uplink/devices and tools.dm index 1ece7844486..ac31a96a810 100644 --- a/code/datums/uplink/devices and tools.dm +++ b/code/datums/uplink/devices and tools.dm @@ -194,4 +194,16 @@ /datum/uplink_item/item/tools/ammo_display name = "Holographic Ammo Display" item_cost = 2 - path = /obj/item/ammo_display \ No newline at end of file + path = /obj/item/ammo_display + +/datum/uplink_item/item/tools/mesons_glasses + name = "Mesons Scanners" + desc = "These glasses make use of meson-scanning technology to allow the wearer to see through solid walls and floors." + item_cost = 2 + path = /obj/item/clothing/glasses/meson + +/datum/uplink_item/item/tools/materials_glasses + name = "Optical Material Scanner" + desc = "These glasses make use of scanning technology to allow the wearer to see objects through solid walls and floors." + item_cost = 2 + path = /obj/item/clothing/glasses/material \ No newline at end of file diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index d01ff3e1beb..944be19f38a 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -833,9 +833,9 @@ req_access = list(access_engine) vend_id = "tools" products = list( - /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/powerdrill = 2, + /obj/item/clothing/glasses/safety/goggles = 4, /obj/item/airlock_electronics = 10, /obj/item/module/power_control = 10, /obj/item/airalarm_electronics = 10, @@ -920,7 +920,7 @@ /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/storage/belt/utility = 4, - /obj/item/clothing/glasses/meson = 4, + /obj/item/clothing/glasses/safety/goggles = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/screwdriver = 12, /obj/item/crowbar = 12, diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 00f604e3498..f9e4c6e04d4 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -736,9 +736,6 @@ /obj/item/bodybag = 0.7, /obj/item/clothing/accessory/storage/knifeharness = 0.3, /obj/item/clothing/accessory/storage/webbing = 0.6, - /obj/item/clothing/glasses/material = 0.8, - /obj/item/clothing/glasses/meson = 0.5, - /obj/item/clothing/glasses/meson/prescription = 0.25, /obj/item/clothing/glasses/sunglasses = 0.75, /obj/item/clothing/glasses/welding = 0.75, /obj/item/clothing/head/bearpelt = 0.4, @@ -932,8 +929,7 @@ /obj/item/storage/backpack/chameleon = 1, /obj/item/storage/backpack/ = 10, - /obj/item/clothing/glasses/chameleon = 1, - /obj/item/clothing/glasses/meson = 1 + /obj/item/clothing/glasses/chameleon = 1 ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 5a40145eaad..9a688c6324c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -40,7 +40,6 @@ new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/tank/emergency_oxygen(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/head/soft/yellow(src) new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src) new /obj/item/export_scanner(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 85c290574aa..df96778bf12 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -31,7 +31,6 @@ new /obj/item/storage/toolbox/mechanical(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/glasses/meson/aviator(src) new /obj/item/device/multitool(src) new /obj/item/device/flash(src) new /obj/item/taperoll/engineering(src) @@ -130,8 +129,6 @@ new /obj/item/device/radio/headset/headset_eng/alt(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/glasses/meson(src) - new /obj/item/clothing/glasses/meson/aviator(src) new /obj/item/cartridge/engineering(src) new /obj/item/taperoll/engineering(src) new /obj/item/clothing/accessory/storage/overalls/engineer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 5296a76a2d3..7671856ac9c 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -166,8 +166,10 @@ /obj/structure/closet/radiation/fill() new /obj/item/clothing/suit/radiation(src) new /obj/item/clothing/head/radiation(src) + new /obj/item/clothing/glasses/safety/goggles(src) new /obj/item/clothing/suit/radiation(src) new /obj/item/clothing/head/radiation(src) + new /obj/item/clothing/glasses/safety/goggles(src) /* * Bombsuit closet diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index f2f96080c9d..860f0c7ad4e 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -189,11 +189,6 @@ STOCK_ITEM_COMMON(wheelchair, 1) new /obj/structure/bed/chair/wheelchair(T) -STOCK_ITEM_COMMON(meson, 1.5) - new /obj/item/clothing/glasses/meson(L) - if(prob(50)) - new /obj/item/clothing/glasses/meson(L) - STOCK_ITEM_COMMON(trap, 2) new /obj/item/trap(L) if(prob(30)) @@ -528,8 +523,7 @@ STOCK_ITEM_COMMON(gasmask, 2) new type(L) STOCK_ITEM_COMMON(mining, 2) - var/list/mine_items = list(/obj/item/shovel, /obj/item/clothing/glasses/material, - /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation) + var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation) for(var/i in 1 to rand(1, 2)) var/to_spawn = pick(mine_items) new to_spawn(L) diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 2081458539a..6f479ece3ad 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -41,21 +41,6 @@ display_name = "science Goggles" path = /obj/item/clothing/glasses/science -/datum/gear/eyes/materialaviators - display_name = "aviators, material" - path = /obj/item/clothing/glasses/material/aviator - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice","Shaft Miner") - -/datum/gear/eyes/mesonaviators - display_name = "aviators, meson" - path = /obj/item/clothing/glasses/meson/aviator - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist", "Shaft Miner") - -/datum/gear/eyes/mesonprescription - display_name = "meson goggles, prescription" - path = /obj/item/clothing/glasses/meson/prescription - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist", "Shaft Miner") - /datum/gear/eyes/security display_name = "security HUD" path = /obj/item/clothing/glasses/hud/security @@ -115,18 +100,6 @@ allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Emergency Medical Technician", "Psychiatrist", "Medical Resident") cost = 2 -/datum/gear/eyes/mespatch - display_name = "HUDpatch, Mesons" - path = /obj/item/clothing/glasses/eyepatch/hud/meson - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist", "Shaft Miner") - cost = 2 - -/datum/gear/eyes/matpatch - display_name = "HUDpatch, Material" - path = /obj/item/clothing/glasses/eyepatch/hud/material - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Shaft Miner") - cost = 2 - /datum/gear/eyes/scipatch display_name = "HUDpatch, Science" path = /obj/item/clothing/glasses/eyepatch/hud/science diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index d15fb9ca8cf..929ca6f72db 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -92,7 +92,6 @@ /obj/item/rig_module/device/drill, /obj/item/rig_module/device/orescanner, /obj/item/rig_module/device/rfd_c, - /obj/item/rig_module/vision/meson, /obj/item/rig_module/actuators ) @@ -127,8 +126,7 @@ initial_modules = list( /obj/item/rig_module/device/basicdrill, /obj/item/rig_module/maneuvering_jets, - /obj/item/rig_module/device/rfd_c, - /obj/item/rig_module/vision/meson + /obj/item/rig_module/device/rfd_c ) /obj/item/clothing/gloves/rig/eva @@ -165,7 +163,6 @@ /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/device/drill, /obj/item/rig_module/device/rfd_c, - /obj/item/rig_module/vision/meson, /obj/item/rig_module/actuators ) diff --git a/code/modules/mining/machine_rigpress.dm b/code/modules/mining/machine_rigpress.dm index c7c4575f665..67ccffe9375 100644 --- a/code/modules/mining/machine_rigpress.dm +++ b/code/modules/mining/machine_rigpress.dm @@ -20,9 +20,6 @@ if(!pressing) var/outcome_path - if(istype(W, /obj/item/clothing/glasses/material) || istype (W,/obj/item/clothing/glasses/meson)) - outcome_path = /obj/item/rig_module/vision/meson - if(istype(W, /obj/item/tank/jetpack)) outcome_path = /obj/item/rig_module/maneuvering_jets diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index d5cd8502d61..da9774fa6fd 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -25,7 +25,6 @@ var/global/list/minevendor_list = list( //keep in order of price new /datum/data/mining_equipment("Seismic Charge", /obj/item/plastique/seismic, 25, 150), new /datum/data/mining_equipment("Deployable Ladder", /obj/item/ladder_mobile, 5, 200), new /datum/data/mining_equipment("Deployable Hoist Kit", /obj/item/hoist_kit, 5, 200), - new /datum/data/mining_equipment("Material Scanners", /obj/item/clothing/glasses/material, 15, 200), new /datum/data/mining_equipment("Mining Drill", /obj/item/pickaxe/drill, 10, 200), new /datum/data/mining_equipment("Deep Ore Scanner", /obj/item/mining_scanner, 10, 250), new /datum/data/mining_equipment("Magboots", /obj/item/clothing/shoes/magboots, 10, 300), diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 6fcab0d069f..cf17bdb51a7 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -356,7 +356,6 @@ var/global/list/robot_modules = list( /obj/item/robot_module/engineering/construction/Initialize() . = ..() - src.modules += new /obj/item/borg/sight/meson(src) src.modules += new /obj/item/powerdrill(src) src.modules += new /obj/item/rfd/construction/borg(src) src.modules += new /obj/item/rfd/piping/borg(src) @@ -415,7 +414,6 @@ var/global/list/robot_modules = list( /obj/item/robot_module/engineering/general/Initialize() . = ..() - src.modules += new /obj/item/borg/sight/meson(src) src.modules += new /obj/item/powerdrill(src) src.modules += new /obj/item/weldingtool/largetank(src) src.modules += new /obj/item/screwdriver/robotic(src) @@ -674,7 +672,6 @@ var/global/list/robot_modules = list( /obj/item/robot_module/miner/Initialize() . = ..() - src.modules += new /obj/item/borg/sight/material(src) src.modules += new /obj/item/storage/bag/ore(src) src.modules += new /obj/item/pickaxe/borgdrill(src) src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src) @@ -947,7 +944,6 @@ var/global/list/robot_modules = list( /obj/item/robot_module/mining_drone/proc/set_up_default(var/mob/living/silicon/robot/R, var/drill = TRUE) modules += new /obj/item/device/flash(src) - modules += new /obj/item/borg/sight/material(src) if(drill) modules += new /obj/item/pickaxe/drill(src) modules += new /obj/item/storage/bag/ore/drone(src) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 7ed0b5db715..a373108aacd 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -458,7 +458,7 @@ if(M.stat == CONSCIOUS) if (istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if(istype(H.glasses,/obj/item/clothing/glasses/meson) && current_size != 11) + if(istype(H.glasses,/obj/item/clothing/glasses/safety) && current_size != 11) to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!") return else diff --git a/code/modules/research/designs/mechfab/hardsuit/modules.dm b/code/modules/research/designs/mechfab/hardsuit/modules.dm index 116b5d9eaa2..0a667b3b3f8 100644 --- a/code/modules/research/designs/mechfab/hardsuit/modules.dm +++ b/code/modules/research/designs/mechfab/hardsuit/modules.dm @@ -17,13 +17,6 @@ materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GOLD = 2000, MATERIAL_SILVER = 3000, MATERIAL_GLASS = 2000) build_path = /obj/item/rig_module/power_sink -/datum/design/hardsuitmodules/meson_module - name = "Hardsuit Meson Scanner" - desc = "A layered, translucent visor system for a hardsuit." - req_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 2, TECH_ENGINEERING = 3) - materials = list(DEFAULT_WALL_MATERIAL = 1500, MATERIAL_GLASS = 5000) - build_path = /obj/item/rig_module/vision/meson - /datum/design/hardsuitmodules/sechud_module name = "Hardsuit Security HUD" desc = "A simple tactical information system for a hardsuit." diff --git a/code/modules/research/designs/protolathe/hud_glasses_designs.dm b/code/modules/research/designs/protolathe/hud_glasses_designs.dm index bfe4df52513..2a1d8c7a5e5 100644 --- a/code/modules/research/designs/protolathe/hud_glasses_designs.dm +++ b/code/modules/research/designs/protolathe/hud_glasses_designs.dm @@ -9,9 +9,3 @@ /datum/design/item/hud/security req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2) build_path = /obj/item/clothing/glasses/hud/security - -/datum/design/item/hud/mesons - desc = "These glasses make use of meson-scanning technology to allow the wearer to see through solid walls and floors." - req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) - materials = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 50) - build_path = /obj/item/clothing/glasses/meson \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index 5ca271c4a5a..e5f7ac85a4d 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -99,7 +99,6 @@ new /obj/item/device/gps(src) new /obj/item/device/beacon_locator(src) new /obj/item/device/radio/beacon(src) - new /obj/item/clothing/glasses/meson(src) new /obj/item/pickaxe(src) new /obj/item/device/measuring_tape(src) new /obj/item/pickaxe/hand(src) diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 7e5c2a541ff..75bc8f6e57a 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -213,7 +213,7 @@ soundloop.volume = min(100, (round(power/7)+1)) else soundloop.volume = 0 - + if(damage > explosion_point) if(!exploded) if(!istype(L, /turf/space)) @@ -291,7 +291,7 @@ env.merge(removed) for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6))))) // If they can see it without mesons on. Bad on them. - if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !l.is_diona() && !l.isSynthetic()) + if(!istype(l.glasses, /obj/item/clothing/glasses/safety) && !l.is_diona() && !l.isSynthetic()) l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) ) if(prob(15)) l.cure_all_traumas(cure_type = CURE_HYPNOSIS) diff --git a/html/changelogs/alberyk-nomesons.yml b/html/changelogs/alberyk-nomesons.yml new file mode 100644 index 00000000000..3a20830d548 --- /dev/null +++ b/html/changelogs/alberyk-nomesons.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - rscdel: "Removed mesons and material scanners from the station." + - tweak: "Safety goggles now protects from supermatter hallucinations." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index d342709aca4..25f69a097d8 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -10723,7 +10723,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/tiled, /area/bridge/aibunker) "atG" = ( diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 54d3004c288..db07661a73c 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -2679,7 +2679,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/maintenance/security_starboard) "aeW" = ( @@ -8681,7 +8680,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/maintenance/engineering) "aqm" = ( @@ -13193,8 +13191,6 @@ /area/engineering/locker_room) "axI" = ( /obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/engineering/locker_room) @@ -19222,8 +19218,6 @@ /area/engineering/engine_airlock) "aHx" = ( /obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -26116,10 +26110,6 @@ pixel_x = 2; pixel_y = 2 }, -/obj/item/clothing/glasses/meson{ - pixel_x = -2; - pixel_y = -2 - }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) "aTm" = ( @@ -26838,7 +26828,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/maintenance/maintcentral) "aUt" = ( @@ -32474,7 +32463,6 @@ pixel_y = -1 }, /obj/item/device/multitool, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/storage/tech) "beC" = ( @@ -33167,7 +33155,6 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialt, /obj/item/device/t_scanner, -/obj/item/clothing/glasses/meson, /obj/item/device/multitool, /turf/simulated/floor/plating, /area/storage/tech) @@ -49287,7 +49274,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/maintenance/research_port) "bMx" = ( @@ -49909,7 +49895,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /turf/simulated/floor/plating, /area/maintenance/medbay) "bNR" = ( diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 9fa858729ac..214e0ebd46b 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -10350,7 +10350,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /obj/machinery/alarm{ pixel_y = 28 }, diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index a18d0b736c2..63694adfbdf 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -891,7 +891,6 @@ /obj/structure/table/reinforced, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/engineering, -/obj/item/clothing/glasses/meson, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/tank/oxygen, /obj/random/tech_supply, @@ -21608,7 +21607,6 @@ /obj/item/clothing/mask/gas, /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, /obj/structure/table/rack{ dir = 1 },