From 3f62424312d2ea20c8fbb1128d72f8a4b0e7fd0a Mon Sep 17 00:00:00 2001 From: Cody Brittain <1779662+Generalcamo@users.noreply.github.com> Date: Sun, 1 Feb 2026 00:14:26 -0500 Subject: [PATCH] [MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774) This has zero reason to exist in our code base. We have no procs or variables tied to this. I removed it to make future modifications cleaner. --------- Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com> --- .github/CONTRIBUTING.md | 74 +- code/__DEFINES/byond_compat.dm | 2 +- code/__DEFINES/global.dm | 2 +- code/__DEFINES/wires.dm | 2 +- code/__HELPERS/global_lists.dm | 2 +- code/__HELPERS/spatial_info.dm | 4 +- code/__HELPERS/unsorted.dm | 4 +- code/_onclick/rig.dm | 2 +- code/controllers/subsystems/arrivals.dm | 2 +- code/controllers/subsystems/cargo.dm | 2 +- code/controllers/subsystems/pai.dm | 8 +- .../subsystems/processing/electronics.dm | 70 +- code/controllers/subsystems/radio.dm | 6 +- .../controllers/subsystems/virtual_reality.dm | 4 +- code/datums/components/multitool/multitool.dm | 10 +- code/datums/mind.dm | 4 +- code/datums/outfits/ert/ap_eridani.dm | 16 +- code/datums/outfits/ert/biesel.dm | 4 +- code/datums/outfits/ert/coalition.dm | 10 +- code/datums/outfits/ert/deathsquad.dm | 4 +- code/datums/outfits/ert/dominia.dm | 4 +- code/datums/outfits/ert/einstein.dm | 6 +- code/datums/outfits/ert/elyra.dm | 6 +- code/datums/outfits/ert/fsf.dm | 8 +- code/datums/outfits/ert/hephaestus_ert.dm | 4 +- code/datums/outfits/ert/iac.dm | 12 +- code/datums/outfits/ert/izweski.dm | 4 +- code/datums/outfits/ert/kataphract.dm | 6 +- code/datums/outfits/ert/kosmostrelki.dm | 14 +- code/datums/outfits/ert/mercenary.dm | 6 +- code/datums/outfits/ert/nt_ert.dm | 2 +- code/datums/outfits/ert/qukala.dm | 6 +- code/datums/outfits/ert/scc_ert.dm | 2 +- code/datums/outfits/ert/syndicate.dm | 2 +- code/datums/outfits/ert/tcfl.dm | 4 +- code/datums/outfits/ert/vaurca.dm | 8 +- code/datums/outfits/ert/zavod.dm | 4 +- code/datums/outfits/ert/zenghu.dm | 6 +- code/datums/outfits/event/outfit_events.dm | 12 +- .../outfits/event/outfit_generic/mercenary.dm | 2 +- .../outfits/event/outfit_generic/mining.dm | 2 +- code/datums/outfits/event/outfit_killers.dm | 4 +- code/datums/outfits/event/outfit_megacorps.dm | 14 +- .../datums/outfits/event/outfit_nanotrasen.dm | 62 +- code/datums/outfits/event/outfit_scc.dm | 10 +- code/datums/outfits/event/outfit_siib.dm | 8 +- code/datums/outfits/event/outfit_tfcl.dm | 2 +- code/datums/outfits/outfit.dm | 12 +- code/datums/outfits/outfit_admin.dm | 4 +- code/datums/outfits/outfit_antag.dm | 60 +- code/datums/trading/ai.dm | 90 +- code/datums/trading/goods.dm | 76 +- code/datums/trading/misc.dm | 4 +- code/datums/trading/unique.dm | 2 +- code/datums/uplink/announcements.dm | 10 +- code/datums/uplink/badassery.dm | 10 +- code/datums/uplink/devices_and_tools.dm | 26 +- code/datums/uplink/exosuit.dm | 8 +- code/datums/uplink/implants.dm | 20 +- code/datums/uplink/revolution.dm | 2 +- .../uplink/stealth and camouflage items.dm | 4 +- code/datums/uplink/telecrystals.dm | 4 +- code/datums/uplink/uplink_categories.dm | 2 +- code/datums/uplink/uplink_items.dm | 22 +- code/datums/wires/radio.dm | 8 +- code/datums/wires/wires.dm | 10 +- code/defines/obj/weapon.dm | 8 +- code/game/antagonist/antagonist_create.dm | 14 +- code/game/antagonist/antagonist_print.dm | 6 +- code/game/antagonist/station/loyalist.dm | 4 +- code/game/antagonist/station/revolutionary.dm | 4 +- code/game/antagonist/station/traitor.dm | 14 +- code/game/gamemodes/cult/cultify/obj.dm | 2 +- code/game/gamemodes/cult/items/armor.dm | 2 +- code/game/gamemodes/cult/runes/convert.dm | 2 +- code/game/gamemodes/cult/runes/sacrifice.dm | 4 +- .../gamemodes/cult/runes/summon_soulstone.dm | 2 +- .../newmalf_ability_trees/HARDWARE.dm | 2 +- code/game/gamemodes/technomancer/equipment.dm | 4 +- code/game/jobs/faction/hephaestus.dm | 2 +- code/game/jobs/faction/idris.dm | 6 +- code/game/jobs/faction/orion_express.dm | 4 +- code/game/jobs/faction/zavodskoi.dm | 2 +- code/game/jobs/faction/zeng_hu.dm | 2 +- code/game/jobs/job/captain.dm | 30 +- code/game/jobs/job/civilian.dm | 106 +- code/game/jobs/job/engineering.dm | 62 +- code/game/jobs/job/event.dm | 12 +- code/game/jobs/job/hra.dm | 10 +- code/game/jobs/job/job.dm | 10 +- code/game/jobs/job/medical.dm | 64 +- code/game/jobs/job/outsider/merchant.dm | 4 +- code/game/jobs/job/outsider/representative.dm | 58 +- code/game/jobs/job/science.dm | 70 +- code/game/jobs/job/security.dm | 50 +- code/game/jobs/job/ship_crew.dm | 42 +- code/game/machinery/Beacon.dm | 4 +- .../machinery/abstract/intercom_listener.dm | 4 +- code/game/machinery/atmoalter/canister.dm | 2 +- .../atmoalter/portable_atmospherics.dm | 4 +- code/game/machinery/body_scanner.dm | 2 +- code/game/machinery/camera/camera_assembly.dm | 2 +- code/game/machinery/camera/presets.dm | 4 +- code/game/machinery/computer/ai_core.dm | 6 +- code/game/machinery/cryopod.dm | 10 +- code/game/machinery/doors/airlock.dm | 12 +- code/game/machinery/machinery.dm | 6 +- code/game/machinery/portable_turret.dm | 4 +- code/game/machinery/recharger.dm | 6 +- code/game/machinery/telecomms/broadcasting.dm | 8 +- .../telecomms/machine_interactions.dm | 4 +- code/game/machinery/teleporter.dm | 2 +- code/game/machinery/vending/_vending.dm | 12 +- code/game/machinery/vending/antagclothes.dm | 4 +- code/game/machinery/vending/booze.dm | 2 +- code/game/machinery/vending/cigarette.dm | 2 +- code/game/machinery/vending/engitech.dm | 100 +- code/game/machinery/vending/hotdrinks.dm | 2 +- code/game/machinery/vending/hydro.dm | 10 +- code/game/machinery/vending/medical.dm | 16 +- code/game/machinery/vending/misc_offship.dm | 4 +- code/game/machinery/vending/miscellaneous.dm | 18 +- code/game/machinery/vending/restocker.dm | 48 +- code/game/machinery/vending/security.dm | 22 +- code/game/machinery/vending/service.dm | 2 +- code/game/machinery/vending/snacks.dm | 4 +- code/game/machinery/vending/soda.dm | 4 +- code/game/objects/auras/personal_shield.dm | 2 +- .../objects/effects/spawners/bombspawner.dm | 10 +- code/game/objects/items.dm | 2 +- code/game/objects/items/devices/PDA/radio.dm | 18 +- .../items/devices/augment_implanter.dm | 34 +- code/game/objects/items/devices/binoculars.dm | 8 +- .../objects/items/devices/chameleonproj.dm | 24 +- .../objects/items/devices/clothes_dyer.dm | 12 +- .../items/devices/cosmetic_surgery_kit.dm | 4 +- code/game/objects/items/devices/debugger.dm | 4 +- code/game/objects/items/devices/dociler.dm | 10 +- .../devices/drop_targeter/_droptargeter.dm | 16 +- .../devices/drop_targeter/orbital_drops.dm | 24 +- code/game/objects/items/devices/flash.dm | 36 +- code/game/objects/items/devices/geiger.dm | 16 +- code/game/objects/items/devices/hacktool.dm | 26 +- .../game/objects/items/devices/hearing_aid.dm | 26 +- .../game/objects/items/devices/holowarrant.dm | 30 +- .../objects/items/devices/laserpointer.dm | 26 +- .../objects/items/devices/lighting/flare.dm | 42 +- .../items/devices/lighting/flashlight.dm | 68 +- .../items/devices/lighting/glowstick.dm | 22 +- .../objects/items/devices/lighting/lamp.dm | 40 +- .../devices/lighting/marshalling_wand.dm | 8 +- .../items/devices/lighting/survival.dm | 2 +- code/game/objects/items/devices/lightmeter.dm | 10 +- .../objects/items/devices/lightreplacer.dm | 38 +- .../objects/items/devices/magnetic_lock.dm | 58 +- code/game/objects/items/devices/megaphone.dm | 30 +- .../game/objects/items/devices/memorywiper.dm | 22 +- .../objects/items/devices/minedetector.dm | 10 +- code/game/objects/items/devices/modkit.dm | 28 +- code/game/objects/items/devices/multitool.dm | 38 +- code/game/objects/items/devices/oxycandle.dm | 12 +- code/game/objects/items/devices/paicard.dm | 54 +- .../objects/items/devices/paint_sprayer.dm | 40 +- .../objects/items/devices/personal_shield.dm | 24 +- .../objects/items/devices/pin_extractor.dm | 10 +- .../objects/items/devices/pipe_painter.dm | 12 +- code/game/objects/items/devices/powersink.dm | 22 +- .../objects/items/devices/radio/beacon.dm | 26 +- .../items/devices/radio/electropack.dm | 14 +- .../items/devices/radio/encryptionkey.dm | 112 +- .../objects/items/devices/radio/headset.dm | 540 +++---- .../objects/items/devices/radio/intercom.dm | 234 +-- .../objects/items/devices/radio/microphone.dm | 4 +- .../game/objects/items/devices/radio/radio.dm | 138 +- .../objects/items/devices/radio_jammer.dm | 48 +- code/game/objects/items/devices/scanners.dm | 80 +- code/game/objects/items/devices/spy_bug.dm | 48 +- .../objects/items/devices/suit_cooling.dm | 34 +- code/game/objects/items/devices/t_scanner.dm | 26 +- .../objects/items/devices/taperecorder.dm | 36 +- .../objects/items/devices/traitordevices.dm | 12 +- .../objects/items/devices/transfer_valve.dm | 34 +- code/game/objects/items/devices/tvcamera.dm | 22 +- code/game/objects/items/devices/uplink.dm | 80 +- .../items/devices/uplink_random_lists.dm | 2 +- code/game/objects/items/devices/versebook.dm | 66 +- code/game/objects/items/devices/whistle.dm | 10 +- code/game/objects/items/paintkit.dm | 14 +- .../objects/items/weapons/cigs_lighters.dm | 4 +- .../circuitboards/machinery/miscboards.dm | 2 +- .../objects/items/weapons/cloaking_device.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 6 +- .../items/weapons/grenades/chem_grenade.dm | 36 +- .../weapons/implants/implants/circuit.dm | 4 +- code/game/objects/items/weapons/landmines.dm | 4 +- .../objects/items/weapons/storage/bags.dm | 4 +- .../objects/items/weapons/storage/belt.dm | 172 +- .../objects/items/weapons/storage/boxes.dm | 54 +- .../objects/items/weapons/storage/firstaid.dm | 24 +- .../objects/items/weapons/storage/storage.dm | 8 +- .../objects/items/weapons/storage/toolbox.dm | 14 +- .../items/weapons/storage/uplink_kits.dm | 8 +- .../objects/items/weapons/storage/wallets.dm | 6 +- .../objects/items/weapons/surgery_tools.dm | 6 +- .../game/objects/items/weapons/tanks/tanks.dm | 14 +- .../objects/items/weapons/teleportation.dm | 2 +- code/game/objects/items/weapons/tether.dm | 2 +- code/game/objects/random/loot.dm | 68 +- code/game/objects/random/misc.dm | 40 +- code/game/objects/random/tech.dm | 20 +- code/game/objects/structures/bonfire.dm | 4 +- .../game/objects/structures/carts/engicart.dm | 10 +- .../game/objects/structures/carts/janicart.dm | 16 +- .../structures/crates_lockers/closets.dm | 14 +- .../crates_lockers/closets/job_closets.dm | 8 +- .../crates_lockers/closets/malfunction.dm | 2 +- .../closets/secure/engineering.dm | 54 +- .../closets/secure/hydroponics.dm | 8 +- .../closets/secure/marooning.dm | 4 +- .../crates_lockers/closets/secure/medical.dm | 36 +- .../closets/secure/operations.dm | 44 +- .../crates_lockers/closets/secure/personal.dm | 8 +- .../closets/secure/scientist.dm | 24 +- .../crates_lockers/closets/secure/security.dm | 98 +- .../crates_lockers/closets/secure/service.dm | 18 +- .../crates_lockers/closets/sol_gear.dm | 4 +- .../crates_lockers/closets/syndicate.dm | 4 +- .../crates_lockers/closets/utility_closets.dm | 36 +- .../crates_lockers/closets/walllocker.dm | 4 +- .../crates_lockers/closets/wardrobe.dm | 2 +- .../crates_lockers/crates/gear_loadout.dm | 34 +- .../fluff/engineering/maintenance.dm | 4 +- .../structures/stool_bed_chair_nest/bed.dm | 2 +- code/game/objects/structures/trash_pile.dm | 10 +- code/game/objects/structures/watercloset.dm | 2 +- code/game/turfs/simulated/wall_attacks.dm | 4 +- code/modules/admin/topic.dm | 4 +- code/modules/admin/verbs/bluespacetech.dm | 16 +- code/modules/admin/verbs/debug.dm | 2 +- code/modules/admin/verbs/mapping.dm | 2 +- code/modules/assembly/assembly.dm | 40 +- code/modules/assembly/bomb.dm | 24 +- code/modules/assembly/helpers.dm | 12 +- code/modules/assembly/holder.dm | 68 +- code/modules/assembly/igniter.dm | 10 +- code/modules/assembly/infrared.dm | 34 +- code/modules/assembly/mousetrap.dm | 26 +- code/modules/assembly/proximity.dm | 28 +- code/modules/assembly/signaler.dm | 46 +- code/modules/assembly/timer.dm | 20 +- code/modules/assembly/voice.dm | 14 +- code/modules/atmospherics/atmospherics.dm | 2 +- code/modules/atmospherics/pipes.dm | 12 +- code/modules/awaymissions/corpse.dm | 22 +- code/modules/background/citizenship/dionae.dm | 6 +- code/modules/background/citizenship/human.dm | 6 +- code/modules/background/citizenship/skrell.dm | 2 +- code/modules/background/citizenship/unathi.dm | 4 +- code/modules/background/citizenship/vaurca.dm | 6 +- code/modules/background/religion/human.dm | 6 +- code/modules/background/religion/tajara.dm | 4 +- code/modules/background/religion/unathi.dm | 8 +- code/modules/cargo/bounties/assistant.dm | 2 +- code/modules/cargo/bounties/security.dm | 8 +- code/modules/cargo/export_scanner.dm | 2 +- code/modules/cargo/exports/tools.dm | 12 +- code/modules/cargo/exports/weapons.dm | 2 +- code/modules/cargo/items/atmos.dm | 2 +- code/modules/cargo/items/custodial.dm | 2 +- code/modules/cargo/items/engineering.dm | 8 +- code/modules/cargo/items/hydroponics.dm | 2 +- code/modules/cargo/items/operations.dm | 30 +- code/modules/cargo/items/recreation.dm | 8 +- code/modules/cargo/items/robotics.dm | 2 +- code/modules/cargo/items/science.dm | 10 +- code/modules/cargo/items/security.dm | 10 +- code/modules/cargo/items/supply.dm | 10 +- code/modules/cargo/random_stock/t1_common.dm | 58 +- .../modules/cargo/random_stock/t2_uncommon.dm | 32 +- code/modules/cargo/random_stock/t3_rare.dm | 6 +- code/modules/cciaa/cciaa_items.dm | 38 +- .../preference_setup/loadout/items/ears.dm | 12 +- .../preference_setup/loadout/items/general.dm | 12 +- .../loadout/items/religion.dm | 14 +- .../preference_setup/loadout/items/utility.dm | 6 +- .../loadout/items/xeno/machine.dm | 2 +- .../loadout/items/xeno/tajara.dm | 16 +- .../loadout/items/xeno/unathi.dm | 10 +- code/modules/clothing/clothing_accessories.dm | 2 +- code/modules/clothing/factions/idris.dm | 2 +- code/modules/clothing/factions/scc.dm | 4 +- code/modules/clothing/factions/trinary.dm | 2 +- code/modules/clothing/sets/acting_captain.dm | 2 +- code/modules/clothing/sets/laser_tag.dm | 2 +- .../clothing/spacesuits/rig/modules/combat.dm | 2 +- .../spacesuits/rig/modules/computer.dm | 2 +- .../clothing/spacesuits/rig/modules/ninja.dm | 6 +- .../spacesuits/rig/modules/utility.dm | 4 +- .../clothing/spacesuits/rig/rig_pieces.dm | 4 +- .../clothing/spacesuits/rig/suits/alien.dm | 6 +- .../clothing/spacesuits/rig/suits/combat.dm | 24 +- .../clothing/spacesuits/rig/suits/ert.dm | 6 +- .../clothing/spacesuits/rig/suits/light.dm | 8 +- .../clothing/spacesuits/rig/suits/merc.dm | 4 +- .../clothing/spacesuits/rig/suits/skrell.dm | 2 +- .../clothing/spacesuits/rig/suits/station.dm | 16 +- .../spacesuits/rig/suits/terminator.dm | 4 +- .../clothing/spacesuits/rig/suits/xanu.dm | 6 +- .../modules/clothing/spacesuits/spacesuits.dm | 2 +- .../clothing/spacesuits/void/alien/skrell.dm | 2 +- .../clothing/spacesuits/void/alien/tajara.dm | 16 +- .../clothing/spacesuits/void/alien/unathi.dm | 6 +- .../clothing/spacesuits/void/captain.dm | 2 +- code/modules/clothing/spacesuits/void/merc.dm | 2 +- code/modules/clothing/spacesuits/void/misc.dm | 28 +- .../clothing/spacesuits/void/station.dm | 14 +- code/modules/clothing/spacesuits/void/void.dm | 8 +- code/modules/clothing/suits/armor.dm | 12 +- code/modules/clothing/suits/hazardvests.dm | 2 +- code/modules/clothing/suits/jobs.dm | 16 +- code/modules/clothing/suits/labcoat.dm | 6 +- code/modules/clothing/suits/miscellaneous.dm | 8 +- code/modules/clothing/suits/utility.dm | 4 +- code/modules/clothing/suits/xeno/tajara.dm | 6 +- .../clothing/under/accessories/accessory.dm | 10 +- code/modules/cooking/machinery/commissary.dm | 8 +- code/modules/custom_ka/core.dm | 6 +- code/modules/customitems/item_defines.dm | 30 +- code/modules/detectivework/tools/crimekit.dm | 6 +- .../detectivework/tools/evidencebag.dm | 2 +- code/modules/detectivework/tools/uvlight.dm | 10 +- code/modules/economy/EFTPOS.dm | 20 +- code/modules/economy/quikpay.dm | 24 +- code/modules/emotes/definitions/_mob.dm | 2 +- .../designs/general/designs_arms.dm | 2 +- .../designs/general/designs_devices.dm | 10 +- .../designs/general/designs_engineering.dm | 4 +- .../designs/general/designs_general.dm | 14 +- .../designs/general/designs_tools.dm | 6 +- .../ghostroles/spawner/human/emergencypod.dm | 38 +- code/modules/ghostroles/spawner/human/pra.dm | 2 +- .../ghostroles/spawner/human/zenghu.dm | 2 +- .../heavy_vehicle/equipment/medical.dm | 18 +- .../heavy_vehicle/equipment/utility.dm | 4 +- .../modules/heavy_vehicle/mech_interaction.dm | 2 +- code/modules/heavy_vehicle/mecha.dm | 16 +- code/modules/holidays/christmas/props.dm | 34 +- code/modules/holomap/portable_map_reader.dm | 2 +- .../modules/hydroponics/beekeeping/beehive.dm | 2 +- code/modules/hydroponics/trays/tray_tools.dm | 14 +- .../integrated_electronics/_defines.dm | 2 +- .../integrated_electronics/core/assemblies.dm | 68 +- .../core/assemblies/clothing.dm | 32 +- .../core/assemblies/generic.dm | 82 +- .../integrated_electronics/core/device.dm | 32 +- .../integrated_electronics/core/helpers.dm | 10 +- .../core/integrated_circuit.dm | 24 +- .../integrated_electronics/core/printer.dm | 22 +- .../integrated_electronics/core/tools.dm | 50 +- .../integrated_electronics/passive/power.dm | 4 +- .../subtypes/built_in.dm | 4 +- .../integrated_electronics/subtypes/input.dm | 2 +- code/modules/item_worth/worths_list.dm | 52 +- code/modules/makeshift/makeshift_reagents.dm | 6 +- code/modules/mining/machine_vending.dm | 18 +- code/modules/mining/mine_items.dm | 14 +- code/modules/mining/mine_turfs.dm | 12 +- code/modules/mining/minebot.dm | 16 +- code/modules/mining/ore.dm | 4 +- code/modules/mob/abstract/ghost/ghost.dm | 2 +- code/modules/mob/language/station.dm | 4 +- code/modules/mob/living/bot/bot.dm | 6 +- code/modules/mob/living/bot/cleanbot.dm | 2 +- code/modules/mob/living/bot/farmbot.dm | 6 +- code/modules/mob/living/bot/medbot.dm | 10 +- code/modules/mob/living/carbon/brain/MMI.dm | 54 +- code/modules/mob/living/carbon/brain/brain.dm | 2 +- code/modules/mob/living/carbon/brain/death.dm | 2 +- code/modules/mob/living/carbon/brain/emote.dm | 2 +- code/modules/mob/living/carbon/brain/life.dm | 2 +- .../mob/living/carbon/brain/posibrain.dm | 22 +- code/modules/mob/living/carbon/brain/robot.dm | 16 +- code/modules/mob/living/carbon/brain/say.dm | 6 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/carbon/human/human_helpers.dm | 2 +- .../mob/living/carbon/human/human_species.dm | 8 +- code/modules/mob/living/carbon/human/say.dm | 32 +- .../human/species/station/diona/diona.dm | 2 +- .../mob/living/carbon/human/update_icons.dm | 6 +- code/modules/mob/living/living_defense.dm | 2 +- code/modules/mob/living/say.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 8 +- .../living/silicon/ai/ai_remote_control.dm | 8 +- code/modules/mob/living/silicon/pai/admin.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 22 +- .../mob/living/silicon/robot/analyzer.dm | 14 +- .../mob/living/silicon/robot/combat_robot.dm | 4 +- .../mob/living/silicon/robot/drone/drone.dm | 2 +- .../mob/living/silicon/robot/items/gripper.dm | 22 +- .../robot/items/modules/robot_shield.dm | 2 +- .../living/silicon/robot/items/robot_parts.dm | 24 +- .../living/silicon/robot/items/robot_tools.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- .../mob/living/silicon/robot/photos.dm | 2 +- .../mob/living/silicon/robot/presets.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 16 +- .../mob/living/silicon/robot/robot_modules.dm | 144 +- code/modules/mob/living/silicon/silicon.dm | 4 +- .../simple_animal/constructs/soulstone.dm | 22 +- .../mob/living/simple_animal/corpse.dm | 4 +- .../simple_animal/friendly/spiderbot.dm | 18 +- .../mob/living/simple_animal/parrot.dm | 18 +- .../modules/mob/living/simple_animal/shade.dm | 4 +- code/modules/mob/mob_helpers.dm | 2 +- code/modules/mob/transform_procs.dm | 4 +- .../computers/modular_computer/hardware.dm | 2 +- .../computers/modular_computer/interaction.dm | 2 +- .../computers/modular_computer/variables.dm | 2 +- .../programs/command/teleporter.dm | 2 +- .../programs/generic/ntnrc_client.dm | 2 +- .../programs/security/guntracker.dm | 4 +- .../modular_computers/hardware/card_slot.dm | 2 +- .../hardware/network_card.dm | 8 +- .../internal/species/machine/posibrain.dm | 8 +- code/modules/organs/organ.dm | 2 +- .../augment/augments/cybrong_analyzer.dm | 2 +- code/modules/organs/subtypes/vaurca.dm | 4 +- .../overmap/contacts/contact_sensors.dm | 2 +- .../exoplanets/decor/flora/potted_big.dm | 2 +- .../ship_weaponry/_ship_ammo_loader.dm | 2 +- .../overmap/ship_weaponry/_ship_gun.dm | 2 +- code/modules/paperwork/handlabeler.dm | 8 +- code/modules/paperwork/photocopier.dm | 10 +- code/modules/paperwork/photography.dm | 38 +- code/modules/paperwork/silicon_photography.dm | 44 +- code/modules/power/antimatter/shielding.dm | 6 +- code/modules/power/apc.dm | 4 +- code/modules/power/cell.dm | 8 +- code/modules/power/fusion/core/core_field.dm | 4 +- code/modules/power/lights/fixtures.dm | 4 +- code/modules/power/turbine.dm | 2 +- code/modules/projectiles/gun.dm | 4 +- .../projectiles/guns/energy/disruptor.dm | 6 +- code/modules/projectiles/guns/energy/laser.dm | 8 +- .../projectiles/guns/energy/modular.dm | 6 +- .../projectiles/guns/energy/nuclear.dm | 4 +- .../projectiles/guns/launcher/pneumatic.dm | 2 +- .../modules/projectiles/modular/laser_base.dm | 14 +- .../projectiles/modular/laser_components.dm | 6 +- code/modules/projectiles/pins.dm | 88 +- code/modules/projectiles/projectile/change.dm | 2 +- code/modules/psionics/events/mini_spasm.dm | 6 +- code/modules/reagents/Chemistry-Recipes.dm | 2 +- .../reagents/reagent_containers/glass.dm | 2 +- code/modules/reagents/reagent_dispenser.dm | 8 +- code/modules/recycling/disposal.dm | 20 +- code/modules/recycling/sortingmachinery.dm | 18 +- .../research/designs/mechfab/robot/robot.dm | 2 +- .../integrated_electronics_designs.dm | 16 +- .../designs/protolathe/medical_designs.dm | 12 +- .../designs/protolathe/mining_designs.dm | 2 +- .../designs/protolathe/modular_gun_designs.dm | 10 +- .../designs/protolathe/tool_designs.dm | 22 +- code/modules/research/server.dm | 2 +- code/modules/research/stockparts.dm | 2 +- code/modules/research/tech_processor.dm | 2 +- code/modules/research/weaponsanalyzer.dm | 26 +- .../xenoarchaeology/artifact/artifact.dm | 12 +- .../artifact/artifact_replicator.dm | 22 +- .../research/xenoarchaeology/finds/finds.dm | 10 +- code/modules/research/xenoarchaeology/misc.dm | 22 +- .../xenoarchaeology/tools/anomaly_suit.dm | 2 +- .../xenoarchaeology/tools/gearbelt.dm | 34 +- .../research/xenoarchaeology/tools/tools.dm | 2 +- .../xenoarchaeology/tools/tools_anoscanner.dm | 10 +- .../tools/tools_coresampler.dm | 10 +- .../tools/tools_depthscanner.dm | 10 +- .../xenoarchaeology/tools/tools_locater.dm | 18 +- code/modules/shuttles/landmarks.dm | 18 +- code/modules/shuttles/shuttle_specops.dm | 4 +- .../spell_system/artifacts/items/poppet.dm | 2 +- .../construct_spells/summon_soulstone.dm | 2 +- code/modules/supermatter/supermatter.dm | 4 +- code/modules/surgery/facial_surgery.dm | 4 +- code/modules/surgery/generic.dm | 2 +- code/modules/surgery/limb_reattach.dm | 2 +- code/modules/surgery/robotics.dm | 6 +- .../docs/Structure.txt | 6 +- .../real_instruments.dm | 16 +- .../real_instruments/Guitar/guitar.dm | 4 +- .../Synthesizer/synthesizer.dm | 2 +- .../real_instruments/Trumpet/trumpet.dm | 2 +- .../real_instruments/Violin/violin.dm | 2 +- .../synthesized_instruments/sound_player.dm | 2 +- code/modules/telesci/gps.dm | 68 +- code/modules/telesci/telepad.dm | 6 +- code/modules/telesci/telesci_computer.dm | 6 +- code/modules/vehicles/vehicle.dm | 2 +- code/modules/ventcrawl/ventcrawl.dm | 8 +- code/unit_tests/create_and_destroy.dm | 4 +- config/example/custom_items.json | 61 +- html/changelogs/GeneralCamo - Device Kill.yml | 58 + html/changelogs/archive/2023-09.yml | 2 +- .../{device => }/advanced_healthanalyzer.dmi | Bin icons/obj/item/{device => }/air_analyzer.dmi | Bin icons/obj/item/{device => }/batterer.dmi | Bin icons/obj/item/{device => }/binoculars.dmi | Bin .../obj/item/{device => }/breath_analyzer.dmi | Bin icons/obj/item/{device => }/chameleon.dmi | Bin icons/obj/item/{device => }/cratescanner.dmi | Bin icons/obj/item/{device => }/dest_tagger.dmi | Bin icons/obj/item/{device => }/eftpos.dmi | Bin icons/obj/item/{device => }/encryptionkey.dmi | Bin .../obj/item/{device => }/export_scanner.dmi | Bin icons/obj/item/{device => }/flash.dmi | Bin icons/obj/item/{device => }/gps.dmi | Bin icons/obj/item/{device => }/hailer.dmi | Bin .../obj/item/{device => }/healthanalyzer.dmi | Bin icons/obj/item/{device => }/hearing_aid.dmi | Bin .../item/{device => }/kinetic_analyzer.dmi | Bin icons/obj/item/{device => }/laser_pointer.dmi | Bin .../item/{device => }/mass_spectrometer.dmi | Bin icons/obj/item/{device => }/megaphone.dmi | Bin icons/obj/item/{device => }/modkit.dmi | Bin icons/obj/item/{device => }/multitool.dmi | Bin icons/obj/item/{device => }/oxycandle.dmi | Bin icons/obj/item/{device => }/paint_sprayer.dmi | Bin icons/obj/item/{device => }/pin_extractor.dmi | Bin icons/obj/item/{device => }/pipe_painter.dmi | Bin .../obj/item/{device => }/plant_analyzer.dmi | Bin icons/obj/item/{device => }/powersink.dmi | Bin icons/obj/item/{device => }/price_scanner.dmi | Bin icons/obj/item/{device => }/radio/headset.dmi | Bin .../item/{device => }/radio/headset_alt.dmi | Bin .../{device => }/radio/headset_alt_double.dmi | Bin .../item/{device => }/radio/headset_clip.dmi | Bin .../item/{device => }/radio/headset_wrist.dmi | Bin .../obj/item/{device => }/reagent_scanner.dmi | Bin icons/obj/item/{device => }/robotanalyzer.dmi | Bin icons/obj/item/{device => }/slime_scanner.dmi | Bin icons/obj/item/{device => }/suitcooler.dmi | Bin icons/obj/item/{device => }/suitrecord.dmi | Bin icons/obj/item/{device => }/t_scanner.dmi | Bin icons/obj/item/{device => }/taperecorder.dmi | Bin icons/obj/item/{device => }/toner.dmi | Bin icons/obj/item/{device => }/tvcamera.dmi | Bin icons/obj/item/{device => }/uv_light.dmi | Bin .../abandoned_diner/abandoned_diner.dmm | 16 +- .../abandoned_industrial_station.dmm | 62 +- .../away_site/abandoned_mining/cursed.dmm | 18 +- .../abandoned_propellant_depot.dmm | 66 +- maps/away/away_site/blueriver/blueriver.dmm | 14 +- .../crashed_elyran_tanker.dmm | 20 +- .../crystal_planet_outpost_.dmm | 20 +- .../crystal_planet_outpost_submaps.dmm | 24 +- maps/away/away_site/cult_base/cult_base.dmm | 46 +- .../cult_base/cult_base_ghostroles.dm | 10 +- .../away_site/first_aurora/first_aurora.dmm | 56 +- .../away_site/hivebot_hub/hivebot_hub.dmm | 10 +- .../away/away_site/idris_wreck/idris_wreck.dm | 2 +- .../away_site/idris_wreck/idris_wreck.dmm | 4 +- .../konyang/point_verdant/point_verdant.dmm | 324 ++-- .../point_verdant/point_verdant_ghostroles.dm | 12 +- maps/away/away_site/magshield/magshield.dmm | 6 +- .../overgrown_mining_station.dmm | 10 +- .../phoron_deposit/phoron_deposit.dmm | 16 +- .../away_site/pirate_base/pirate_base.dmm | 104 +- .../pirate_base/pirate_base_ghostroles.dm | 2 +- .../quarantined_outpost.dmm | 30 +- .../quarantined_outpost_objects.dm | 6 +- maps/away/away_site/racers/racers.dmm | 76 +- .../away_site/romanovich/grand_romanovich.dmm | 72 +- .../romanovich/grand_romanovich_ghostroles.dm | 10 +- .../hegemony_waypoint/hegemony_waypoint.dmm | 20 +- .../hegemony_waypoint_submaps.dmm | 16 +- .../solarian_prewar/sensor_relay.dmm | 30 +- maps/away/away_site/shady/shady.dmm | 4 +- .../tajara/mining_jack/mining_jack.dmm | 18 +- .../mining_jack/mining_jack_ghostroles.dm | 2 +- .../peoples_station/peoples_station.dmm | 66 +- .../peoples_station_ghostroles.dm | 4 +- .../tajara/pra_satellite/pra_satellite.dmm | 6 +- .../saniorios_outpost/saniorios_outpost.dmm | 22 +- .../saniorios_outpost_ghostroles.dm | 2 +- .../away_site/tajara/scrapper/scrapper.dmm | 8 +- .../tajara/scrapper/scrapper_ghostroles.dm | 2 +- .../tajara/taj_safehouse/tajara_safehouse.dmm | 20 +- .../tajara_safehouse_ghostroles.dm | 2 +- .../treasure_trove/treasure_trove.dmm | 36 +- .../treasure_trove/treasure_trove_submaps.dmm | 14 +- .../uueoaesa/omgolo/omgolo_tourist.dmm | 6 +- .../uueoaesa/reclamation/ihss_reclamation.dmm | 58 +- .../ihss_reclamation_ghostroles.dm | 4 +- .../uueoaesa/tret/tret_industrial_complex.dmm | 36 +- .../tret_industrial_complex_ghostroles.dm | 6 +- .../wrecked_nt_ship/wrecked_nt_ship.dmm | 10 +- .../scenarios/cryo_outpost/cryo_outpost.dmm | 64 +- .../cryo_outpost/cryo_outpost_outfits.dm | 12 +- .../cryo_outpost/cryo_outpost_submaps.dmm | 10 +- .../decrepit_shipyard/decrepit_shipyard.dmm | 34 +- .../decrepit_shipyard_submaps.dmm | 10 +- ...nviro_testing_facility_submaps_layouts.dmm | 26 +- .../enviro_testing_facility_submaps_main.dmm | 158 +- .../scenarios/nuclear_silo/nuclear_silo.dmm | 106 +- .../nuclear_silo/nuclear_silo_outfits.dm | 18 +- .../nuclear_silo/nuclear_silo_submaps.dmm | 16 +- .../ruined_propellant_depot.dmm | 72 +- .../biesel/tcaf_corvette/tcaf_corvette.dmm | 136 +- .../tcaf_corvette/tcaf_corvette_ghostroles.dm | 2 +- .../tcfl_patrol/tcfl_peacekeeper_ship.dmm | 50 +- .../tcfl_peacekeeper_ship_ghostroles.dm | 2 +- maps/away/ships/casino/casino.dmm | 24 +- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 40 +- .../coc/coc_ranger/coc_ship_ghostroles.dm | 2 +- maps/away/ships/coc/coc_scarab/coc_scarab.dmm | 52 +- .../coc/coc_scarab/coc_scarab_ghostroles.dm | 2 +- .../ships/coc/coc_surveyor/coc_surveyor.dmm | 24 +- .../coc_surveyor/coc_surveyor_ghostroles.dm | 2 +- .../coc/gadpathur_patrol/gadpathur_patrol.dmm | 20 +- .../gadpathur_patrol_ghostroles.dm | 2 +- .../dominian_corvette/dominian_corvette.dmm | 74 +- .../dominian_corvette_ghostroles.dm | 2 +- .../dominian_science_vessel.dmm | 72 +- .../dominian_science_vessel_ghostroles.dm | 8 +- .../dominian_unathi_privateer.dmm | 20 +- .../dominian_unathi_privateer_ghostroles.dm | 4 +- .../dpra/hailstorm/hailstorm_ghostroles.dm | 2 +- .../ships/dpra/hailstorm/hailstorm_ship.dmm | 38 +- maps/away/ships/einstein/ee_spy_ship.dmm | 18 +- .../ships/einstein/ee_spy_ship_ghostroles.dm | 4 +- .../elyra/elyra_corvette/elyra_corvette.dmm | 52 +- .../elyra_corvette_ghostroles.dm | 2 +- .../freebooter_salvager.dmm | 54 +- .../freebooter_ship/freebooter_ship_.dmm | 16 +- .../freebooter_ship_ghostroles.dm | 2 +- .../freebooter_ship_submaps.dmm | 14 +- maps/away/ships/golden_deep/golden_deep.dmm | 90 +- .../golden_deep/golden_deep_ghostroles.dm | 2 +- .../ships/golden_deep/golden_deep_submaps.dmm | 54 +- .../fishing_league_trawler.dmm | 12 +- .../fishing_league_trawler_ghostroles.dm | 2 +- .../hegemony_corvette/hegemony_corvette.dmm | 32 +- .../hegemony_corvette/hegemony_ghostroles.dm | 4 +- .../merchants_guild/merchant_freighter.dmm | 14 +- .../merchant_freighter_ghostroles.dm | 2 +- .../miners_guild/miners_guild_ghostroles.dm | 2 +- .../miners_guild/miners_guild_station.dmm | 16 +- maps/away/ships/heph/cyclops/cyclops.dmm | 20 +- .../ships/heph/cyclops/cyclops_ghostroles.dm | 2 +- .../heph/heph_security/heph_security.dmm | 30 +- .../heph_security/heph_security_ghostroles.dm | 2 +- maps/away/ships/himeo/himeo_patrol_ship.dmm | 44 +- .../himeo/himeo_patrol_ship_ghostroles.dm | 4 +- .../ships/himeo/himeo_patrol_ship_submaps.dmm | 6 +- maps/away/ships/iac/iac_rescue_ship.dmm | 30 +- .../ships/iac/iac_rescue_ship_ghostroles.dm | 2 +- maps/away/ships/idris/idris_cruiser.dmm | 110 +- .../ships/idris/idris_cruiser_ghostroles.dm | 2 +- .../ships/kataphracts/kataphract_ship.dmm | 32 +- .../kataphracts/kataphract_ship_ghostroles.dm | 2 +- .../air_konyang/air_konyang_ghostroles.dm | 2 +- .../einstein_shuttle/einstein_shuttle.dm | 2 +- .../konyang/ipc_refugee/ipc_refugee_ship.dmm | 32 +- .../ipc_refugee_ship_ghostroles.dm | 8 +- .../ships/konyang/kasf_ship/kasf_ship.dmm | 60 +- .../konyang/kasf_ship/kasf_ship_ghostroles.dm | 2 +- .../konyang/konyang_wreck/konyang_wreck.dmm | 10 +- .../ships/konyang/water_barge/water_barge.dmm | 8 +- maps/away/ships/lone_spacer/lone_spacer.dmm | 46 +- .../lone_spacer/lone_spacer_ghostroles.dm | 2 +- .../ships/lone_spacer/lone_spacer_submaps.dmm | 28 +- .../ships/nka/nka_merchant/nka_merchant.dmm | 48 +- .../nka_merchant/nka_merchant_ghostroles.dm | 2 +- .../orion_express_ship/orion_express_ship.dmm | 40 +- .../orion_express_ship_ghostroles.dm | 2 +- .../ships/orion/orion_miner/orion_miner.dmm | 32 +- .../orion_miner/orion_miner_ghostroles.dm | 2 +- .../database_freighter/database_freighter.dmm | 32 +- .../database_freighter_ghostroles.dm | 2 +- .../pra/headmaster/headmaster_ghostroles.dm | 2 +- .../ships/pra/headmaster/headmaster_ship.dmm | 78 +- maps/away/ships/sadar_scout/sadar_scout.dmm | 14 +- .../sadar_scout/sadar_scout_ghostroles.dm | 2 +- maps/away/ships/scc/scc_scout_ship.dmm | 88 +- .../ships/scc/scc_scout_ship_ghostroles.dm | 2 +- .../ships/sol/sol_frigate/sol_frigate.dmm | 46 +- .../sol_frigate/sol_frigateship_ghostroles.dm | 2 +- .../ships/sol/sol_merc/fsf_patrol_ship.dmm | 30 +- .../sol_merc/fsf_patrol_ship_ghostroles.dm | 4 +- .../ships/sol/sol_pirate/sfa_patrol_ship.dmm | 34 +- .../sol_pirate/sfa_patrol_ship_ghostroles.dm | 4 +- maps/away/ships/sol/sol_splf/splf_raider.dmm | 48 +- .../sol/sol_splf/splf_raider_ghostroles.dm | 4 +- maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm | 76 +- .../sol/sol_ssrm/ssrm_ship_ghostroles.dm | 8 +- .../ships/tajara/circus/adhomian_circus.dmm | 18 +- .../tajara/circus/adhomian_circus_roles.dm | 2 +- .../tajara/taj_smuggler/tajaran_smuggler.dmm | 16 +- .../tajaran_smuggler_ghostroles.dm | 2 +- .../tirakqi_smuggler/tirakqi_smuggler.dmm | 44 +- .../tirakqi_smuggler_ghostroles.dm | 2 +- .../ships/tramp_freighter/tramp_freighter.dmm | 48 +- .../tramp_freighter_ghostroles.dm | 2 +- .../hiskyn/unathi_pirate_hiskyn.dmm | 26 +- .../hiskyn/unathi_pirate_hiskyn_ghostroles.dm | 2 +- .../izharshan/unathi_pirate_izharshan.dmm | 16 +- .../unathi_pirate_izharshan_ghostroles.dm | 2 +- .../tarwa/unathi_pirate_tarwa.dmm | 42 +- .../tarwa/unathi_pirate_tarwa_ghostroles.dm | 4 +- .../ships/wildlands_militia/militia_ship.dmm | 14 +- .../militia_ship_ghostroles.dm | 2 +- maps/away/ships/xanu/xanu_frigate.dmm | 100 +- .../ships/xanu/xanu_frigate_ghostroles.dm | 4 +- maps/away/ships/yacht/yacht.dmm | 2 +- maps/away/ships/yacht_civ/yacht_civ.dmm | 12 +- .../ships/yacht_civ/yacht_civ_ghostroles.dm | 2 +- maps/dungeon_spawns/carp_nest01.dmm | 2 +- maps/dungeon_spawns/carp_nest06.dmm | 2 +- maps/dungeon_spawns/coc_ship_unique.dmm | 6 +- maps/dungeon_spawns/crashed_pod_unique.dmm | 2 +- maps/dungeon_spawns/escape_pod_unique.dmm | 2 +- .../dungeon_spawns/satellite_crash_unique.dmm | 2 +- maps/dungeon_spawns/shuttle_unique.dmm | 2 +- maps/dungeon_spawns/skrell_crash_unique.dmm | 12 +- maps/dungeon_spawns/vannatusk_unique.dmm | 4 +- maps/event/generic_dock/generic_dock-1.dmm | 108 +- maps/event/halloween/halloween.dmm | 18 +- maps/event/idris_cruise/idris_cruise-1.dmm | 336 ++-- maps/event/rooftop/rooftop-1.dmm | 74 +- .../helpers/event_shuttles/sccv_apollo_v1.dmm | 202 +-- .../helpers/event_shuttles/sccv_apollo_v2.dmm | 202 +-- .../helpers/event_shuttles/sccv_apollo_v3.dmm | 212 +-- maps/helpers/event_shuttles/sccv_artemis.dmm | 218 +-- maps/helpers/event_shuttles/sccv_packrat.dmm | 190 +-- .../massfab_armory_and_military.dmm | 72 +- .../pre_fabricated/massfab_civilian_misc.dmm | 12 +- .../pre_fabricated/massfab_industrial.dmm | 16 +- .../pre_fabricated/massfab_medical.dmm | 36 +- .../adhomai/adhomai_abandoned_labor_camp.dmm | 2 +- .../exoplanets/adhomai/adhomai_archeology.dmm | 8 +- .../exoplanets/adhomai/adhomai_bar.dmm | 4 +- .../adhomai/adhomai_fallout_bunker.dmm | 42 +- .../exoplanets/adhomai/adhomai_hunting.dmm | 8 +- .../adhomai/adhomai_raskariim_hideout.dmm | 4 +- .../adhomai/adhomai_schlorrgo_cage.dmm | 6 +- .../exoplanets/adhomai/adhomai_silo.dm | 2 +- .../exoplanets/adhomai/adhomai_silo.dmm | 2 +- .../exoplanets/adhomai/adhomai_village.dmm | 6 +- .../exoplanets/adhomai/ala_base.dm | 2 +- .../exoplanets/adhomai/ala_base.dmm | 14 +- .../exoplanets/adhomai/ala_cell.dmm | 10 +- .../exoplanets/adhomai/nka_base.dm | 2 +- .../exoplanets/adhomai/nka_base.dmm | 8 +- .../adhomai/north_pole_nka_expedition.dm | 4 +- .../adhomai/north_pole_nka_expedition.dmm | 12 +- .../exoplanets/adhomai/pra_base.dm | 4 +- .../exoplanets/adhomai/pra_base.dmm | 16 +- .../exoplanets/adhomai/pra_mining_camp.dm | 2 +- .../exoplanets/adhomai/pra_mining_camp.dmm | 20 +- .../exoplanets/adhomai/psis_outpost.dm | 2 +- .../exoplanets/adhomai/psis_outpost.dmm | 22 +- .../abandoned_prison/abandoned_prison.dmm | 10 +- .../asteroid/carp_nest/carp_nest.dmm | 2 +- .../coalition_base/coalition_base.dmm | 4 +- .../asteroid/coc_ship/coc_ship_unique.dmm | 6 +- .../crashed_pod/crashed_pod_unique.dmm | 2 +- .../asteroid/digsite/digsite_unique.dmm | 2 +- .../asteroid/escape_pod/escape_pod_unique.dmm | 2 +- .../asteroid/mining_base/mining_base.dmm | 2 +- .../mystery_ship/mystery_ship_unique.dmm | 2 +- .../satellite_crash_unique.dmm | 2 +- .../skrell_ship/skrell_crash_unique.dmm | 14 +- .../exoplanets/biesel/pra_camp_site.dmm | 2 +- .../exoplanets/burzsia/burzsia_mining.dmm | 38 +- .../exoplanets/delivery/delivery_site.dmm | 2 +- .../desert/desert_camp/desert_camp.dmm | 4 +- .../desert/desert_comms/desert_comms.dmm | 12 +- .../smuggler_hideout/smuggler_hideout.dmm | 8 +- .../exoplanets/grove/batcave/batcave.dmm | 6 +- .../grove/crashsurvivors/crashsurvivors.dm | 2 +- .../random_ruins/exoplanets/grove/hut/hut.dmm | 2 +- .../grove/sdf_outpost/sdf_outpost.dmm | 8 +- .../exoplanets/haneunim/haneunim_mining.dmm | 12 +- .../exoplanets/haneunim/haneunim_refugees.dm | 2 +- .../konyang/abandoned/abandoned_outpost.dmm | 10 +- .../konyang/abandoned/abandoned_village.dmm | 4 +- .../konyang/abandoned/factory_arms.dmm | 32 +- .../konyang/abandoned/factory_robotics.dmm | 14 +- .../konyang/abandoned/house_small.dmm | 8 +- .../konyang/abandoned/landing_zone.dmm | 36 +- .../exoplanets/konyang/abandoned/office.dmm | 2 +- .../konyang/abandoned/rural_clinic.dm | 2 +- .../konyang/abandoned/rural_clinic.dmm | 4 +- .../exoplanets/konyang/fireoutpost.dmm | 16 +- .../exoplanets/konyang/hivebot_burrows_1.dmm | 28 +- .../exoplanets/konyang/hivebot_burrows_2.dmm | 44 +- .../exoplanets/konyang/homestead.dmm | 2 +- .../exoplanets/konyang/landing_zone.dmm | 36 +- .../konyang/ocean/naval_landing_zone.dmm | 36 +- .../exoplanets/konyang/pirate_outpost.dmm | 8 +- .../exoplanets/konyang/stranded_police.dmm | 4 +- .../exoplanets/konyang/swamp_2.dmm | 2 +- .../exoplanets/konyang/swamp_3.dmm | 2 +- .../exoplanets/konyang/swamp_4.dmm | 4 +- .../exoplanets/konyang/telecomms_outpost.dm | 2 +- .../exoplanets/konyang/telecomms_outpost.dmm | 14 +- .../exoplanets/konyang/tribute.dmm | 10 +- .../exoplanets/konyang/village.dmm | 4 +- .../exoplanets/moghes/moghes_bar.dmm | 10 +- .../exoplanets/moghes/moghes_diona_traders.dm | 4 +- .../moghes/moghes_diona_traders.dmm | 16 +- .../exoplanets/moghes/moghes_guild_mining.dmm | 24 +- .../moghes/moghes_hegemony_base.dmm | 26 +- .../exoplanets/moghes/moghes_heph_mining.dmm | 32 +- .../moghes/moghes_kataphract_wasteland.dmm | 28 +- .../exoplanets/moghes/moghes_kung_fu.dmm | 2 +- .../exoplanets/moghes/moghes_ruined_base.dmm | 16 +- .../exoplanets/moghes/moghes_siakh.dm | 2 +- .../exoplanets/moghes/moghes_siakh.dmm | 8 +- .../exoplanets/moghes/moghes_skakh.dmm | 22 +- .../exoplanets/moghes/moghes_thakh.dmm | 18 +- .../moghes/moghes_untouched_village.dmm | 8 +- .../moghes/moghes_wasteland_dorviza.dmm | 18 +- .../moghes/moghes_wasteland_izweski.dmm | 34 +- .../moghes/moghes_wasteland_klax.dmm | 18 +- .../moghes/moghes_wasteland_mikuetz.dmm | 12 +- .../moghes/moghes_wasteland_ozeuoi.dmm | 16 +- .../moghes/moghes_wasteland_priests.dmm | 14 +- .../moghes/moghes_wasteland_queendom.dmm | 24 +- .../moghes/moghes_wasteland_reclaimers.dmm | 8 +- .../moghes/moghes_wasteland_vihnmes.dmm | 6 +- .../moghes/moghes_wasteland_village.dmm | 6 +- .../exoplanets/new_gibson/gibson_mining.dmm | 2 +- .../exoplanets/new_gibson/gibson_resupply.dmm | 4 +- .../exoplanets/ouerea/ouerea_autakh.dmm | 12 +- .../exoplanets/ouerea/ouerea_bar.dmm | 4 +- .../exoplanets/ouerea/ouerea_farm.dmm | 18 +- .../exoplanets/ouerea/ouerea_freewater.dmm | 28 +- .../exoplanets/ouerea/ouerea_guild_mining.dmm | 24 +- .../ouerea/ouerea_hegemony_base.dmm | 20 +- .../exoplanets/ouerea/ouerea_heph_mining.dmm | 32 +- .../exoplanets/ouerea/ouerea_nt_ruin.dmm | 4 +- .../exoplanets/ouerea/ouerea_skrell_base.dmm | 4 +- .../exoplanets/ouerea/ouerea_sol_base.dmm | 2 +- .../exoplanets/ouerea/ouerea_village.dmm | 8 +- .../exoplanets/raskara/raskara_okon.dmm | 34 +- .../exoplanets/raskara/raskara_wreck.dmm | 2 +- .../uueoaesa/heph_mining_station.dmm | 32 +- .../exoplanets/uueoaesa/heph_survey_post.dmm | 14 +- .../uueoaesa/miners_guild_outpost.dmm | 32 +- .../exoplanets/uueoaesa/pid_kois_farm.dmm | 14 +- maps/runtime/runtime.dmm | 32 +- maps/sccv_horizon/sccv_horizon.dmm | 1382 ++++++++--------- .../submaps/ops_warehouse_small_storage.dmm | 6 +- maps/templates/distress/dominia.dmm | 10 +- maps/templates/distress/kataphracts.dmm | 12 +- maps/templates/distress/tcaf.dmm | 18 +- 857 files changed, 8690 insertions(+), 8599 deletions(-) create mode 100644 html/changelogs/GeneralCamo - Device Kill.yml rename icons/obj/item/{device => }/advanced_healthanalyzer.dmi (100%) rename icons/obj/item/{device => }/air_analyzer.dmi (100%) rename icons/obj/item/{device => }/batterer.dmi (100%) rename icons/obj/item/{device => }/binoculars.dmi (100%) rename icons/obj/item/{device => }/breath_analyzer.dmi (100%) rename icons/obj/item/{device => }/chameleon.dmi (100%) rename icons/obj/item/{device => }/cratescanner.dmi (100%) rename icons/obj/item/{device => }/dest_tagger.dmi (100%) rename icons/obj/item/{device => }/eftpos.dmi (100%) rename icons/obj/item/{device => }/encryptionkey.dmi (100%) rename icons/obj/item/{device => }/export_scanner.dmi (100%) rename icons/obj/item/{device => }/flash.dmi (100%) rename icons/obj/item/{device => }/gps.dmi (100%) rename icons/obj/item/{device => }/hailer.dmi (100%) rename icons/obj/item/{device => }/healthanalyzer.dmi (100%) rename icons/obj/item/{device => }/hearing_aid.dmi (100%) rename icons/obj/item/{device => }/kinetic_analyzer.dmi (100%) rename icons/obj/item/{device => }/laser_pointer.dmi (100%) rename icons/obj/item/{device => }/mass_spectrometer.dmi (100%) rename icons/obj/item/{device => }/megaphone.dmi (100%) rename icons/obj/item/{device => }/modkit.dmi (100%) rename icons/obj/item/{device => }/multitool.dmi (100%) rename icons/obj/item/{device => }/oxycandle.dmi (100%) rename icons/obj/item/{device => }/paint_sprayer.dmi (100%) rename icons/obj/item/{device => }/pin_extractor.dmi (100%) rename icons/obj/item/{device => }/pipe_painter.dmi (100%) rename icons/obj/item/{device => }/plant_analyzer.dmi (100%) rename icons/obj/item/{device => }/powersink.dmi (100%) rename icons/obj/item/{device => }/price_scanner.dmi (100%) rename icons/obj/item/{device => }/radio/headset.dmi (100%) rename icons/obj/item/{device => }/radio/headset_alt.dmi (100%) rename icons/obj/item/{device => }/radio/headset_alt_double.dmi (100%) rename icons/obj/item/{device => }/radio/headset_clip.dmi (100%) rename icons/obj/item/{device => }/radio/headset_wrist.dmi (100%) rename icons/obj/item/{device => }/reagent_scanner.dmi (100%) rename icons/obj/item/{device => }/robotanalyzer.dmi (100%) rename icons/obj/item/{device => }/slime_scanner.dmi (100%) rename icons/obj/item/{device => }/suitcooler.dmi (100%) rename icons/obj/item/{device => }/suitrecord.dmi (100%) rename icons/obj/item/{device => }/t_scanner.dmi (100%) rename icons/obj/item/{device => }/taperecorder.dmi (100%) rename icons/obj/item/{device => }/toner.dmi (100%) rename icons/obj/item/{device => }/tvcamera.dmi (100%) rename icons/obj/item/{device => }/uv_light.dmi (100%) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d8e6c625915..2df8bfa43db 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,4 +1,5 @@ # Licensing + Aurora Station code is licensed under the [GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.en.html), which can be found in full in LICENSE-AGPL3.txt. Commits with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00) are licensed under the GNU General Public License version 3, which can be found in full in LICENSE-GPL3.txt. @@ -10,6 +11,7 @@ All assets including icons and sound are under a [Creative Commons 3.0 BY-SA](ht # GitHub Standards ### Sub-licensing External Content + **When does this section apply to me?** When you are integrating content that is **not** licensed under [AGPLv3](https://www.gnu.org/licenses/agpl-3.0.en.html) (code) or [Creative Commons 3.0 BY-SA](https://creativecommons.org/licenses/by-sa/3.0/) (icons and sounds). The most common application here is for icons and sounds gathered from an external source or repository. @@ -27,6 +29,7 @@ or within the plain text describing the change itself. When reading the sub-sections that follow, note that these will be **generalizations**, and the specifics will be dictated by the license itself. #### Code + Code from most other open source SS13 code bases is GPLv3 or AGPLv3. This means that it's free to be copied without any additional effort. Though any notes of authorship within the code files, if presents, must be kept intact. Be wary of **Goon**: their code is licensed under CC-BY-SA-NC and is **not** directly compatible with our codebase's license. Porting Goon code directly is highly discouraged as a result. @@ -36,6 +39,7 @@ and that a separate license file (if present in/packaged with the original sourc porting in this manner into a `modules/` sub folder, and stick the license file in there. #### Other Assets (Sound, Icons) + If the material is distributed under CC-BY-SA 3.0, then it can go straight into the relevant folders, as long as you attribute the author(s) in the PR and changelog if they can be identified. @@ -43,6 +47,7 @@ In any other case, create a subfolder somewhere in the relevant structure, stick license permits the intended use of the content in the appropriate manner. ### Peer Review + All pull requests are subject to peer review prior to being merged. After said reviews, they are given a final once-over by a maintainer and then merged if good. @@ -55,6 +60,7 @@ This is to ensure that there is enough time to review and discuss new additionsf A **bug fix** pull request will require **two** reviews, if it is to be merged in the first 24 hours, or **one** following the first 24 hours. ### Prefer Atomic Pull-Requests + Pull requests should do **one** thing. This means that a series of small, dependant pull requests is preferred over one large, monolithic one. @@ -65,6 +71,7 @@ Small pull requests allow for easier reverting, easier (and faster!) reviewing a developers in the future to more easily locate all changes relevant to a potential issue. ### Changelogs + Changelogs are automatically parsed from within the `html/changelogs` folder. A readme file exists there with specific information on how to create and manage changelogs. All pull requests which contain player-visible changes are required to have a changelog. Any others, like pull requests containing background system tweaks, minor optimizations, admin systems, etcetera, do not necessarily require a changelog. @@ -76,20 +83,23 @@ about it. # Coding Standards ### Absolute Pathing + Absolute pathing has to be used for type, proc, and verb definitions. This is to make searching and reading easier. An example of properly pathed code: + ```DM -/obj/item/device/cake +/obj/item/cake [cake code here] -/obj/item/device/cake/proc/eat_cake() +/obj/item/cake/proc/eat_cake() [proc code here] ``` An example of badly pathed code: + ```DM -/obj/item/device/cake +/obj/item/cake [cake code here] proc/eat_cake() @@ -97,6 +107,7 @@ An example of badly pathed code: ``` ### Initialize() over New() + Since the implementation of the Stoned Master Controller, overrides of the `New()` proc have effectively become depracted in favour of `Initialize()` and `LateInitialize()`. In most cases, `Initialize()` is a drop-in replacement for `New()`, however, there are a few considerations to be taken into account when using this. Specifically, `Initialize()` must always return a initialization hint and must always call the superior definition via `..()`. Usually these two are done together, either via the `. = ..()` semantics or with explicit `return ..()` statements. `LateInitialize()` can be used to manage race conditions during map loading. In the middle of the game, when `mapload = FALSE` in `Initialize()`, `LateInitialize()` is called immediately after the specific atom's `Initialize()` call. However, if `mapload = TRUE`, which it does during map atom initialization, the `LateInitialization()` of an atom is called once all atoms have finished their `Initialization()` calls. Note that `Initialize()` needs to return `INITIALIZE_HINT_LATELOAD` in order for `LateInitialization()` to be called in either case. @@ -104,9 +115,11 @@ Since the implementation of the Stoned Master Controller, overrides of the `New( Refer to the [wiki](https://github.com/Aurorastation/Aurora.3/wiki/Atom-Initialization) article for further information. ### qdel() and Destroy() usage -All objects with an applicable type need to be deleted by `qdel()`, as opposed to the regular `del()` proc. While conducting this action, make sure you remove all possible references to the object you assign for deletion *after* calling `qdel()`. This will enable the garbage collector to handle the objects assigned to it at its own pace, thus reducing lag in the long run. + +All objects with an applicable type need to be deleted by `qdel()`, as opposed to the regular `del()` proc. While conducting this action, make sure you remove all possible references to the object you assign for deletion _after_ calling `qdel()`. This will enable the garbage collector to handle the objects assigned to it at its own pace, thus reducing lag in the long run. An example of how to use `qdel()`: + ```DM /obj/item/plate var/obj/item/cake/cake @@ -126,6 +139,7 @@ The `Destroy()` proc for objects should be defined, if there are any special ope Note that any modified `Destroy()` proc must always **call its superior definition `..()`** and **must return a deletion hint.** Usually the hint passed down from the superior definition is returned, via `. = ..()` or an explicit `return ..()` statement. An example of how to define `Destroy()` for an item that needs it: + ```DM /obj/item/plate var/obj/item/cake/cake @@ -144,39 +158,45 @@ An example of how to define `Destroy()` for an item that needs it: ``` `qdel()` is **not** capable of handling the following types of objects: -* file -* savefile -* SQLLite object -* list objects. -* turfs -* areas (Note that these shouldn't be deleted at all) + +- file +- savefile +- SQLLite object +- list objects. +- turfs +- areas (Note that these shouldn't be deleted at all) You will have to use the regular `del()` proc to delete any object of that type (except for `/turf`, which should use `ChangeTurf()`). More details on qdel, Garbage, and `Destroy()` are available [on the wiki](https://github.com/Aurorastation/Aurora.3/wiki/Garbage%2C-qdel%2C-and-Destroy). ### HTML styling for user output + All text output to the user, specially if the output operator `<<` is used, should be formatted in proper HTML. DM text macros for styling, such as `\red` and `\blue`, are no longer to be used actively. This will enable the modification of used HTML styling later down the line, via the centralized .css files. It will also enable a switch from an output panel, to other output methods. For reference, here are the standard span classes for user output, and the correlation between them and the DM text macros: -* `` corresponds to `\red` and is bold. -* `` also corresponds to `\red` and is not bold. -* `` corresponds to `\blue` and is not bold. + +- `` corresponds to `\red` and is bold. +- `` also corresponds to `\red` and is not bold. +- `` corresponds to `\blue` and is not bold. There exist pre-processor macros for using these spans. `span(class, text)` which is the equivalent of typing a string that looks like this: `"[text]"` and macros such as `SPAN_WARNING(text)`, `SPAN_NOTICE(text)`, `SPAN_DANGER(text)`. Using the SPAN_X() macros is preferred. The stylesheet available for use within DM can be found in `code/stylesheet.dm`. ### Usage of forceMove + In order to make `Exited()` and `Entered()` procs more reliable, the usage of `forceMove()` when forcibly moving one item to another location, be it another item or turf, is required. Directly changing an item's loc values will skip over calls to the aforementioned procs, thus making them less useful and more unreliable. An example of improper item moving: + ```DM /proc/some_proc(var/obj/A, var/obj/B) A.loc = B // Simply move A inside B. ``` An example of proper item moving: + ```DM /proc/some_proc(var/obj/A, var/obj/B) A.forceMove(B) // This will call A.loc.Exited() and B.Entered(). @@ -184,20 +204,24 @@ An example of proper item moving: ``` ### Regarding the variable usr + If at all possible, procs outside of verbs and `Topic()` should avoid reliance on `usr`, and instead use a custom argument to specify the user and its expected type. This makes it easier to reuse procs in chains where `usr` is not always defined, and combats against potential security flaws that relying on `usr` can bring. `usr` must also always be validated to be the expected type! ### Reserved argument names + All BYOND procs have a set list of variables which are implicitly defined in each proc. However, the DM compiler will allow you to reuse these names as names for your custom variables. This should be avoided at all costs, to improve the readability and understanding of code. A list of reserved argument names instantiated with all procs: -* `vars` being an alias of `src.vars` if `src` exists. -* `args` -* `usr` -* `src` + +- `vars` being an alias of `src.vars` if `src` exists. +- `args` +- `usr` +- `src` ### Avoid `in world` loops + Due to the amount of instances in the world, utilizing an `in world` loop should be avoided in all instances. In large projects, specially when crawling for types that are not optimized internally by BYOND (only core built-in types are), crawling `in world` will surmount to a very large blocking loop and will almost certainly trigger the infinite loop warning. This forces the specific callstack to sleep at least once. Note that a for-each loop without an explicit container specified will default to an `in world` loop. This is to say, the following two examples are equivalent: @@ -211,21 +235,25 @@ for (var/client/C in world) ``` ### Database prefixing + All tables for the database should be prefixed according to the following list: -* `ss13_` for tables in which ingame data is held. -* `discord_` for tables in which BOREALIS data is held. + +- `ss13_` for tables in which ingame data is held. +- `discord_` for tables in which BOREALIS data is held. # HTML UI Standards ### UI conversion policy + Due to our current situation with 5 different HTML UI systems we are now enforcing a policy that all new UIs should be made using the TGUI system. This policy also applies to editing existing UIs, with the following exceptions: - 1. Modification is security / severe bug fix. - 0. It is typo fix. - 0. Touched UI file is too large. - 0. TGUI can't accommodate that type of UI. +1. Modification is security / severe bug fix. +2. It is typo fix. +3. Touched UI file is too large. +4. TGUI can't accommodate that type of UI. ### Globals + All globals must use the defines found in `__defines/_globals.dm`. This is to store globals inside the Global Controller, allowing us to view and edit them at runtime. Here are a few examples. `GLOBAL_VAR(thing)` will create a global variable `var/thing` accessed with `GLOB.thing`. `GLOBAL_LIST_INIT(list_of_stuff, list("stuff", "thing"))` will create a global list `var/list/list_of_stuff = list("stuff, thing")` accessed with `GLOB.list_of_stuff`. diff --git a/code/__DEFINES/byond_compat.dm b/code/__DEFINES/byond_compat.dm index 87671d83dd2..8bd1b328478 100644 --- a/code/__DEFINES/byond_compat.dm +++ b/code/__DEFINES/byond_compat.dm @@ -2,7 +2,7 @@ //Update this whenever you need to take advantage of more recent byond features #define MIN_COMPILER_VERSION 516 -#define MIN_COMPILER_BUILD 1673 +#define MIN_COMPILER_BUILD 1650 #if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) && !defined(OPENDREAM) //Don't forget to update this part #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. diff --git a/code/__DEFINES/global.dm b/code/__DEFINES/global.dm index d2da0e011e8..646262ae1b3 100644 --- a/code/__DEFINES/global.dm +++ b/code/__DEFINES/global.dm @@ -155,7 +155,7 @@ GLOBAL_LIST_INIT(scarySounds, list( GLOBAL_VAR_INIT(max_explosion_range, 14) // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it. -GLOBAL_DATUM_INIT(global_announcer, /obj/item/device/radio/all_channels, new) +GLOBAL_DATUM_INIT(global_announcer, /obj/item/radio/all_channels, new) // the number next to it denotes how much money the department receives when its account is generated GLOBAL_LIST_INIT(department_funds, list( diff --git a/code/__DEFINES/wires.dm b/code/__DEFINES/wires.dm index d130b97ad17..c111a952f4d 100644 --- a/code/__DEFINES/wires.dm +++ b/code/__DEFINES/wires.dm @@ -88,7 +88,7 @@ /*################################ Wires for the assembly - /obj/item/device/assembly + /obj/item/assembly ################################*/ ///Allows Pulsed(0) to call Activate() diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 58cc8132421..3e8a2a2473c 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(whitelisted_species, list(SPECIES_HUMAN)) GLOBAL_LIST_EMPTY(playable_species) /// All uplinks. -GLOBAL_LIST_EMPTY_TYPED(world_uplinks, /obj/item/device/uplink) +GLOBAL_LIST_EMPTY_TYPED(world_uplinks, /obj/item/uplink) /// Preferences stuff below. /// Stores /datum/sprite_accessory/hair indexed by name. diff --git a/code/__HELPERS/spatial_info.dm b/code/__HELPERS/spatial_info.dm index 89b8f7a5741..5506ff29a3d 100644 --- a/code/__HELPERS/spatial_info.dm +++ b/code/__HELPERS/spatial_info.dm @@ -197,10 +197,10 @@ . -= target break -/proc/get_hearers_in_radio_ranges(list/obj/item/device/radios) +/proc/get_hearers_in_radio_ranges(list/obj/item/radios) . = list() // Returns a list of mobs who can hear any of the radios given in @radios - for(var/obj/item/device/radio/radio as anything in radios) + for(var/obj/item/radio/radio as anything in radios) . |= get_hearers_in_LOS(radio.canhear_range, radio, FALSE) ///Calculate if two atoms are in sight, returns TRUE or FALSE diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index aaa5d38140e..a83f2a4f1ac 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -914,7 +914,7 @@ GLOBAL_LIST_INIT(common_tools, list( /obj/item/wirecutters, /obj/item/powerdrill, /obj/item/combitool, - /obj/item/device/multitool, + /obj/item/multitool, /obj/item/crowbar)) /proc/istool(O) @@ -1005,7 +1005,7 @@ GLOBAL_LIST_INIT(common_tools, list( GLOBAL_LIST_INIT(wall_items, typecacheof(list( /obj/machinery/power/apc, /obj/machinery/alarm, - /obj/item/device/radio/intercom, + /obj/item/radio/intercom, /obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank, /obj/machinery/status_display, diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm index 34d223b5b39..5f7c9fe2164 100644 --- a/code/_onclick/rig.dm +++ b/code/_onclick/rig.dm @@ -48,7 +48,7 @@ return 1 /mob/living/carbon/brain/can_use_rig() - return istype(loc, /obj/item/device/mmi) + return istype(loc, /obj/item/mmi) /mob/living/silicon/ai/can_use_rig() return carded diff --git a/code/controllers/subsystems/arrivals.dm b/code/controllers/subsystems/arrivals.dm index bf868ba700a..3251846d136 100644 --- a/code/controllers/subsystems/arrivals.dm +++ b/code/controllers/subsystems/arrivals.dm @@ -58,7 +58,7 @@ SUBSYSTEM_DEF(arrivals) return 1 if(istype(A,/obj/machinery/nuclearbomb)) return 1 - if(istype(A,/obj/item/device/radio/beacon)) + if(istype(A,/obj/item/radio/beacon)) return 1 if(istype(A,/obj/item/phylactery)) return 1 diff --git a/code/controllers/subsystems/cargo.dm b/code/controllers/subsystems/cargo.dm index f94e6769957..481d6eb007b 100644 --- a/code/controllers/subsystems/cargo.dm +++ b/code/controllers/subsystems/cargo.dm @@ -473,7 +473,7 @@ SUBSYSTEM_DEF(cargo) return 1 if(istype(A, /obj/machinery/nuclearbomb)) return 1 - if(istype(A, /obj/item/device/radio/beacon)) + if(istype(A, /obj/item/radio/beacon)) return 1 for(var/i=1, i<=A.contents.len, i++) diff --git a/code/controllers/subsystems/pai.dm b/code/controllers/subsystems/pai.dm index 7cf89a5b588..300e408e1b0 100644 --- a/code/controllers/subsystems/pai.dm +++ b/code/controllers/subsystems/pai.dm @@ -49,7 +49,7 @@ SUBSYSTEM_DEF(pai) to_chat(usr, SPAN_WARNING("Please set your pAI name.")) return candidate.ready = TRUE - for(var/obj/item/device/paicard/p in all_pai_devices) + for(var/obj/item/paicard/p in all_pai_devices) if(p.looking_for_personality) p.alertUpdate() ui.close() @@ -81,13 +81,13 @@ SUBSYSTEM_DEF(pai) /datum/controller/subsystem/pai/Topic(href, list/href_list) if(href_list["download"]) var/datum/paiCandidate/candidate = locate(href_list["candidate"]) - var/obj/item/device/paicard/card = locate(href_list["device"]) + var/obj/item/paicard/card = locate(href_list["device"]) if (!(candidate in pai_candidates)) return if(card.pai) return - if(istype(card,/obj/item/device/paicard) && istype(candidate,/datum/paiCandidate)) + if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate)) var/mob/living/silicon/pai/pai = new(card) if(!candidate.name) pai.name = pick(GLOB.ninja_names) @@ -175,7 +175,7 @@ SUBSYSTEM_DEF(pai) return data -/datum/controller/subsystem/pai/proc/findPAI(obj/item/device/paicard/p, mob/user) +/datum/controller/subsystem/pai/proc/findPAI(obj/item/paicard/p, mob/user) requestRecruits(user) var/list/available = list() for(var/datum/paiCandidate/c in SSpai.pai_candidates) diff --git a/code/controllers/subsystems/processing/electronics.dm b/code/controllers/subsystems/processing/electronics.dm index c09b0704d05..a792dd9fa0c 100644 --- a/code/controllers/subsystems/processing/electronics.dm +++ b/code/controllers/subsystems/processing/electronics.dm @@ -40,38 +40,38 @@ PROCESSING_SUBSYSTEM_DEF(electronics) // Now for non-circuit things. printer_recipe_list["Assemblies"] = list( - new /obj/item/device/electronic_assembly/default, - new /obj/item/device/electronic_assembly/calc, - new /obj/item/device/electronic_assembly/clam, - new /obj/item/device/electronic_assembly/simple, - new /obj/item/device/electronic_assembly/hook, - new /obj/item/device/electronic_assembly/pda, - new /obj/item/device/electronic_assembly/tiny/default, - new /obj/item/device/electronic_assembly/tiny/cylinder, - new /obj/item/device/electronic_assembly/tiny/scanner, - new /obj/item/device/electronic_assembly/tiny/hook, - new /obj/item/device/electronic_assembly/tiny/box, - new /obj/item/device/electronic_assembly/medium/default, - new /obj/item/device/electronic_assembly/medium/box, - new /obj/item/device/electronic_assembly/medium/clam, - new /obj/item/device/electronic_assembly/medium/medical, - new /obj/item/device/electronic_assembly/medium/gun, - new /obj/item/device/electronic_assembly/medium/radio, - new /obj/item/device/electronic_assembly/large/default, - new /obj/item/device/electronic_assembly/large/scope, - new /obj/item/device/electronic_assembly/large/terminal, - new /obj/item/device/electronic_assembly/large/arm, - new /obj/item/device/electronic_assembly/large/tall, - new /obj/item/device/electronic_assembly/large/industrial, - new /obj/item/device/electronic_assembly/drone/default, - new /obj/item/device/electronic_assembly/drone/arms, - new /obj/item/device/electronic_assembly/drone/medbot, - new /obj/item/device/electronic_assembly/drone/genbot, - new /obj/item/device/electronic_assembly/drone/android, - new /obj/item/device/electronic_assembly/wallmount/tiny, - new /obj/item/device/electronic_assembly/wallmount/light, - new /obj/item/device/electronic_assembly/wallmount, - new /obj/item/device/electronic_assembly/wallmount/heavy, + new /obj/item/electronic_assembly/default, + new /obj/item/electronic_assembly/calc, + new /obj/item/electronic_assembly/clam, + new /obj/item/electronic_assembly/simple, + new /obj/item/electronic_assembly/hook, + new /obj/item/electronic_assembly/pda, + new /obj/item/electronic_assembly/tiny/default, + new /obj/item/electronic_assembly/tiny/cylinder, + new /obj/item/electronic_assembly/tiny/scanner, + new /obj/item/electronic_assembly/tiny/hook, + new /obj/item/electronic_assembly/tiny/box, + new /obj/item/electronic_assembly/medium/default, + new /obj/item/electronic_assembly/medium/box, + new /obj/item/electronic_assembly/medium/clam, + new /obj/item/electronic_assembly/medium/medical, + new /obj/item/electronic_assembly/medium/gun, + new /obj/item/electronic_assembly/medium/radio, + new /obj/item/electronic_assembly/large/default, + new /obj/item/electronic_assembly/large/scope, + new /obj/item/electronic_assembly/large/terminal, + new /obj/item/electronic_assembly/large/arm, + new /obj/item/electronic_assembly/large/tall, + new /obj/item/electronic_assembly/large/industrial, + new /obj/item/electronic_assembly/drone/default, + new /obj/item/electronic_assembly/drone/arms, + new /obj/item/electronic_assembly/drone/medbot, + new /obj/item/electronic_assembly/drone/genbot, + new /obj/item/electronic_assembly/drone/android, + new /obj/item/electronic_assembly/wallmount/tiny, + new /obj/item/electronic_assembly/wallmount/light, + new /obj/item/electronic_assembly/wallmount, + new /obj/item/electronic_assembly/wallmount/heavy, new /obj/item/implant/integrated_circuit, new /obj/item/clothing/under/circuitry, new /obj/item/clothing/gloves/circuitry, @@ -83,9 +83,9 @@ PROCESSING_SUBSYSTEM_DEF(electronics) ) printer_recipe_list["Tools"] = list( - new /obj/item/device/integrated_electronics/wirer, - new /obj/item/device/integrated_electronics/debugger, - new /obj/item/device/integrated_electronics/detailer + new /obj/item/integrated_electronics/wirer, + new /obj/item/integrated_electronics/debugger, + new /obj/item/integrated_electronics/detailer ) for(var/category in printer_recipe_list) diff --git a/code/controllers/subsystems/radio.dm b/code/controllers/subsystems/radio.dm index 5940e18a1ee..330f9cc3b69 100644 --- a/code/controllers/subsystems/radio.dm +++ b/code/controllers/subsystems/radio.dm @@ -238,10 +238,10 @@ SUBSYSTEM_DEF(radio) LAZYREPLACEKEY(ALL_RADIO_CHANNELS, old_channel, new_channel) reverseradiochannels["[freq]"] = new_channel - for(var/obj/item/device/radio/R in RF.devices[RADIO_CHAT]) - var/obj/item/device/radio/headset/H = R + for(var/obj/item/radio/R in RF.devices[RADIO_CHAT]) + var/obj/item/radio/headset/H = R if(istype(H)) - for(var/obj/item/device/encryptionkey/EK in list(H.keyslot1, H.keyslot2)) + for(var/obj/item/encryptionkey/EK in list(H.keyslot1, H.keyslot2)) if(old_channel in EK.channels) LAZYREPLACEKEY(EK.channels, old_channel, new_channel) diff --git a/code/controllers/subsystems/virtual_reality.dm b/code/controllers/subsystems/virtual_reality.dm index ba368818cff..6a818b22028 100644 --- a/code/controllers/subsystems/virtual_reality.dm +++ b/code/controllers/subsystems/virtual_reality.dm @@ -152,8 +152,8 @@ SUBSYSTEM_DEF(virtualreality) var/mob/living/simple_animal/spiderbot/SB = target SB.internal_id.access = original_id.access // Update radio - var/obj/item/device/encryptionkey/Key = spider.radio.keyslot - var/obj/item/device/radio/Radio = M.get_radio() + var/obj/item/encryptionkey/Key = spider.radio.keyslot + var/obj/item/radio/Radio = M.get_radio() if(Key && Radio) Key.channels = Radio.channels spider.radio.recalculateChannels() diff --git a/code/datums/components/multitool/multitool.dm b/code/datums/components/multitool/multitool.dm index 199da048322..c262ad1924a 100644 --- a/code/datums/components/multitool/multitool.dm +++ b/code/datums/components/multitool/multitool.dm @@ -8,7 +8,7 @@ callback_get_interact_window = interact_window on_topic_interaction = new_on_topic -/datum/component/multitool/proc/interact(var/obj/item/device/multitool/M, var/mob/user) +/datum/component/multitool/proc/interact(var/obj/item/multitool/M, var/mob/user) if(CanUseTopic(user) != STATUS_INTERACTIVE) return @@ -24,7 +24,7 @@ /datum/component/multitool/proc/close_window(var/mob/user) user << browse(null, "window=multitool") -/datum/component/multitool/proc/buffer(var/obj/item/device/multitool/multitool) +/datum/component/multitool/proc/buffer(var/obj/item/multitool/multitool) . += "Buffer Memory:
" var/buffer_name = multitool.get_buffer_name() if(buffer_name) @@ -49,7 +49,7 @@ return 1 var/mob/user = usr - var/obj/item/device/multitool/M = user.get_multitool() + var/obj/item/multitool/M = user.get_multitool() if(href_list["send"]) var/atom/buffer = locate(href_list["send"]) . = send_buffer(M, buffer, user) @@ -69,12 +69,12 @@ /datum/component/multitool/proc/on_topic(href, href_list, user) return MT_NOACTION -/datum/component/multitool/proc/send_buffer(var/obj/item/device/multitool/M, var/atom/buffer, var/mob/user) +/datum/component/multitool/proc/send_buffer(var/obj/item/multitool/M, var/atom/buffer, var/mob/user) if(M.get_buffer() == buffer && buffer) receive_buffer(M, buffer, user) else if(!buffer) to_chat(user, SPAN_WARNING("Unable to acquire data from the buffered object. Purging from memory.")) return MT_REFRESH -/datum/component/multitool/proc/receive_buffer(var/obj/item/device/multitool/M, var/atom/buffer, var/mob/user) +/datum/component/multitool/proc/receive_buffer(var/obj/item/multitool/M, var/atom/buffer, var/mob/user) return diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 09d96dfe068..db9b0457e9d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -433,7 +433,7 @@ memory = null//Remove any memory they may have had. if("crystals") if (usr.client.holder.rights & R_FUN) - var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() + var/obj/item/uplink/hidden/suplink = find_syndicate_uplink() var/crystals if (suplink) crystals = suplink.telecrystals + suplink.bluecrystals @@ -470,7 +470,7 @@ return null /datum/mind/proc/take_uplink() - var/obj/item/device/uplink/hidden/H = find_syndicate_uplink() + var/obj/item/uplink/hidden/H = find_syndicate_uplink() if(H) qdel(H) diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm index 9aa2c68273b..ce18782c10c 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -14,7 +14,7 @@ back = /obj/item/storage/backpack/satchel/sec belt = /obj/item/storage/belt/military id = /obj/item/card/id/distress/ap_eridani - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress l_pocket = /obj/item/grenade/chem_grenade/teargas r_pocket = /obj/item/tank/emergency_oxygen/double @@ -29,10 +29,10 @@ belt_contents = list( /obj/item/ammo_magazine/c45m/auto = 3, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 1, /obj/item/melee/baton/stunrod = 1, - /obj/item/device/flashlight/maglight = 1, + /obj/item/flashlight/maglight = 1, /obj/item/shield/riot/tact = 1, /obj/item/grenade/flashbang = 1 ) @@ -74,7 +74,7 @@ belt_contents = list( /obj/item/ammo_magazine/c45m/auto = 3, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 1, /obj/item/melee/baton/stunrod = 1, /obj/item/grenade/flashbang = 1, @@ -97,8 +97,8 @@ back = /obj/item/storage/backpack/satchel/med accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1) - r_ear = /obj/item/device/flashlight/pen - l_pocket = /obj/item/device/healthanalyzer + r_ear = /obj/item/flashlight/pen + l_pocket = /obj/item/healthanalyzer r_pocket = /obj/item/melee/telebaton l_hand = /obj/item/clothing/head/helmet/space/void/medical r_hand = /obj/item/clothing/suit/space/void/medical @@ -108,7 +108,7 @@ /obj/item/storage/box/survival = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/surgery = 1, - /obj/item/device/advanced_healthanalyzer = 1, + /obj/item/advanced_healthanalyzer = 1, /obj/item/clothing/accessory/storage/pouches/black = 1, /obj/item/reagent_containers/glass/bottle/thetamycin = 1, /obj/item/surgery/scalpel/manager = 1, @@ -141,7 +141,7 @@ belt = /obj/item/storage/belt/medical/paramedic/combat accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1) - l_pocket = /obj/item/device/healthanalyzer + l_pocket = /obj/item/healthanalyzer r_pocket = /obj/item/crowbar l_hand = /obj/item/storage/firstaid/adv diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm index a53722682f9..fef7063c622 100644 --- a/code/datums/outfits/ert/biesel.dm +++ b/code/datums/outfits/ert/biesel.dm @@ -8,7 +8,7 @@ shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/distress/legion/tcaf accessory = /obj/item/clothing/accessory/holster/hip - l_ear = /obj/item/device/radio/headset/legion + l_ear = /obj/item/radio/headset/legion r_pocket = /obj/item/crowbar/red l_pocket = /obj/item/tank/emergency_oxygen/double back = /obj/item/storage/backpack/tcaf @@ -84,7 +84,7 @@ /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/energy/sword/knife = 1, diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm index 65ff9543450..ea048a55847 100644 --- a/code/datums/outfits/ert/coalition.dm +++ b/code/datums/outfits/ert/coalition.dm @@ -3,7 +3,7 @@ uniform = /obj/item/clothing/under/tactical shoes = /obj/item/clothing/shoes/magboots gloves = /obj/item/clothing/gloves/combat - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress l_pocket = /obj/item/tank/emergency_oxygen/double r_pocket = /obj/item/crowbar/red id = /obj/item/card/id/ert @@ -38,7 +38,7 @@ /obj/item/ammo_magazine/c45m = 3, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/material/knife/tacknife = 1 @@ -99,7 +99,7 @@ back = /obj/item/tank/jetpack/carbondioxide l_pocket = /obj/item/tank/emergency_oxygen/double r_pocket = /obj/item/crowbar/red - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress gloves = /obj/item/clothing/gloves/swat/ert mask = /obj/item/clothing/mask/gas/tactical suit_store = /obj/item/gun/projectile/automatic/rifle/konyang/k556 @@ -122,7 +122,7 @@ /obj/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(H.isSynthetic()) - H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/suit_cooling_unit(H), slot_back) /obj/outfit/admin/ert/konyang/medic name = "KASF Medic" @@ -147,7 +147,7 @@ /obj/item/ammo_magazine/mc9mm = 2, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/energy/sword/knife/sol = 1 diff --git a/code/datums/outfits/ert/deathsquad.dm b/code/datums/outfits/ert/deathsquad.dm index 807d1574315..3de056c55ae 100644 --- a/code/datums/outfits/ert/deathsquad.dm +++ b/code/datums/outfits/ert/deathsquad.dm @@ -7,7 +7,7 @@ shoes = null gloves = null mask = /obj/item/clothing/mask/gas/swat - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical id = /obj/item/card/id/asset_protection l_pocket = /obj/item/plastique @@ -31,7 +31,7 @@ name = "Asset Protection Lead" l_pocket = /obj/item/pinpointer - r_hand = /obj/item/device/orbital_dropper/icarus_drones + r_hand = /obj/item/orbital_dropper/icarus_drones /obj/outfit/admin/deathsquad/get_id_access() return get_all_accesses() diff --git a/code/datums/outfits/ert/dominia.dm b/code/datums/outfits/ert/dominia.dm index a65b3e2dd71..a1bbfcb0537 100644 --- a/code/datums/outfits/ert/dominia.dm +++ b/code/datums/outfits/ert/dominia.dm @@ -11,7 +11,7 @@ l_pocket = /obj/item/crowbar/red suit_accessory = /obj/item/clothing/accessory/dominia id = /obj/item/card/id/imperial_fleet - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress mask = /obj/item/clothing/mask/gas accessory = /obj/item/clothing/accessory/holster/hip accessory_contents = list( @@ -50,7 +50,7 @@ /obj/item/ammo_magazine/c45m/dominia = 1, /obj/item/ammo_magazine/submachinemag = 2, /obj/item/storage/firstaid/adv = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/material/knife/bayonet= 1, diff --git a/code/datums/outfits/ert/einstein.dm b/code/datums/outfits/ert/einstein.dm index a4e83b04b72..0ab09eb9d24 100644 --- a/code/datums/outfits/ert/einstein.dm +++ b/code/datums/outfits/ert/einstein.dm @@ -6,7 +6,7 @@ head = /obj/item/clothing/head/helmet/space/void/einstein back = /obj/item/tank/jetpack/carbondioxide belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress id = /obj/item/card/id/zeng_hu mask = /obj/item/clothing/mask/gas/tactical glasses = /obj/item/clothing/glasses/night @@ -19,7 +19,7 @@ ) belt_contents = list( /obj/item/shield/energy = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/flashbang = 2, @@ -41,7 +41,7 @@ /obj/item/ammo_magazine/c45m = 2, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/baton/loaded = 1, diff --git a/code/datums/outfits/ert/elyra.dm b/code/datums/outfits/ert/elyra.dm index 0d253b3e5fa..6a8decb224c 100644 --- a/code/datums/outfits/ert/elyra.dm +++ b/code/datums/outfits/ert/elyra.dm @@ -4,7 +4,7 @@ uniform = /obj/item/clothing/under/rank/elyran_fatigues shoes = /obj/item/clothing/shoes/magboots gloves = /obj/item/clothing/gloves/combat - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress l_pocket = /obj/item/tank/emergency_oxygen/double r_pocket = /obj/item/crowbar/red id = /obj/item/card/id/ert @@ -75,7 +75,7 @@ /obj/item/ammo_magazine/c45m = 3, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/energy/sword = 1 @@ -114,4 +114,4 @@ l_hand = /obj/item/gun/projectile/plasma accessory = /obj/item/clothing/accessory/storage/black_vest - accessory_contents = list(/obj/item/device/flash = 1, /obj/item/handcuffs = 2, /obj/item/gun/projectile/pistol = 1) + accessory_contents = list(/obj/item/flash = 1, /obj/item/handcuffs = 2, /obj/item/gun/projectile/pistol = 1) diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm index 58b8a30233d..ba35525dfc5 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -12,7 +12,7 @@ id = /obj/item/card/id/distress/fsf l_pocket = /obj/item/tank/emergency_oxygen/double - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/melee/energy/sword/knife/sol = 1 @@ -48,7 +48,7 @@ /obj/item/storage/box/shells/buckshot = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/energy/sword/knife/sol = 1 @@ -121,10 +121,10 @@ l_pocket = null belt_contents = null - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/melee/energy/sword/knife/sol = 1, /obj/item/grenade/smokebomb = 2, - /obj/item/device/binoculars = 1 + /obj/item/binoculars = 1 ) diff --git a/code/datums/outfits/ert/hephaestus_ert.dm b/code/datums/outfits/ert/hephaestus_ert.dm index 18520eefac4..14eb5f7f2fc 100644 --- a/code/datums/outfits/ert/hephaestus_ert.dm +++ b/code/datums/outfits/ert/hephaestus_ert.dm @@ -9,7 +9,7 @@ suit = /obj/item/clothing/suit/space/void/hephaestus head = /obj/item/clothing/head/helmet/space/void/hephaestus belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress id = /obj/item/card/id/hephaestus mask = /obj/item/clothing/mask/gas/tactical glasses = /obj/item/clothing/glasses/night @@ -57,7 +57,7 @@ /obj/item/ammo_magazine/c45m = 3, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/baton/loaded = 1, diff --git a/code/datums/outfits/ert/iac.dm b/code/datums/outfits/ert/iac.dm index be76d844794..92194cf1232 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -14,7 +14,7 @@ id = /obj/item/card/id/distress/iac accessory_contents = list(/obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/reagent_containers/glass/bottle/mortaphenyl = 1) - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -22,8 +22,8 @@ /obj/item/storage/firstaid/surgery = 1, /obj/item/storage/box/gloves = 1, /obj/item/storage/box/syringes = 1, - /obj/item/device/flashlight/pen = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/flashlight/pen = 1, + /obj/item/healthanalyzer = 1 ) belt_contents = list( @@ -79,10 +79,10 @@ belt_contents = list( /obj/item/ammo_magazine/c45m/auto = 3, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, - /obj/item/device/flashlight/flare = 1 + /obj/item/flashlight/flare = 1 ) /obj/outfit/admin/ert/iac/paramedic @@ -95,7 +95,7 @@ backpack_contents = list( /obj/item/storage/box/survival = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/storage/firstaid/adv = 2, /obj/item/storage/firstaid/o2 = 1, /obj/item/storage/box/syringes = 1, diff --git a/code/datums/outfits/ert/izweski.dm b/code/datums/outfits/ert/izweski.dm index aae7e0269ad..a472b2adfa9 100644 --- a/code/datums/outfits/ert/izweski.dm +++ b/code/datums/outfits/ert/izweski.dm @@ -10,7 +10,7 @@ accessory_contents = list(/obj/item/gun/energy/pistol/hegemony = 1) gloves = /obj/item/clothing/gloves/black/unathi back = /obj/item/recharger_backpack/high - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress l_pocket = /obj/item/tank/emergency_oxygen/double belt_contents = list( /obj/item/melee/energy/sword/hegemony = 1, @@ -48,7 +48,7 @@ /obj/item/shield/energy/hegemony = 1, /obj/item/crowbar = 1, /obj/item/storage/firstaid/adv = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/handcuffs/ziptie = 2 ) gloves = /obj/item/clothing/gloves/latex/nitrile/unathi diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm index b58aa5ed002..8eb4d4004bd 100644 --- a/code/datums/outfits/ert/kataphract.dm +++ b/code/datums/outfits/ert/kataphract.dm @@ -13,10 +13,10 @@ id = /obj/item/card/id/distress/kataphract back = /obj/item/storage/backpack/satchel/hegemony - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress l_hand = /obj/item/martial_manual/swordsmanship - r_pocket = /obj/item/device/radio + r_pocket = /obj/item/radio belt_contents = null @@ -102,7 +102,7 @@ /obj/item/storage/box/unique/donkpockets = 1, /obj/item/crowbar = 1, /obj/item/storage/firstaid/adv = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/reagent_containers/glass/bottle/thetamycin = 1, /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1 ) diff --git a/code/datums/outfits/ert/kosmostrelki.dm b/code/datums/outfits/ert/kosmostrelki.dm index 13ebb6958f2..21292a349b2 100644 --- a/code/datums/outfits/ert/kosmostrelki.dm +++ b/code/datums/outfits/ert/kosmostrelki.dm @@ -5,7 +5,7 @@ shoes = /obj/item/clothing/shoes/magboots gloves = /obj/item/clothing/gloves/black/tajara uniform = /obj/item/clothing/under/tajaran/cosmonaut - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress head = /obj/item/clothing/head/helmet/space/void/pra suit = /obj/item/clothing/suit/space/void/pra suit_store = /obj/item/tank/oxygen/red @@ -41,7 +41,7 @@ back = /obj/item/storage/backpack/satchel/leather backpack_contents = list( - /obj/item/device/versebook/pra = 1, + /obj/item/versebook/pra = 1, /obj/item/storage/box/hadii_card = 1, /obj/item/gun/projectile/deagle/adhomai = 1, /obj/item/clothing/accessory/holster/hip/brown = 1, @@ -49,7 +49,7 @@ /obj/item/clothing/head/tajaran/cosmonaut_commissar = 1 ) - l_pocket = /obj/item/device/megaphone + l_pocket = /obj/item/megaphone accessory = /obj/item/clothing/accessory/hadii_pin l_hand = /obj/item/martial_manual/tajara @@ -70,10 +70,10 @@ backpack_contents = list( /obj/item/gun/projectile/automatic/tommygun = 1, /obj/item/clothing/accessory/holster/hip/brown = 1, - /obj/item/device/binoculars = 1, + /obj/item/binoculars = 1, /obj/item/ammo_magazine/submachinedrum = 1) - l_pocket = /obj/item/device/megaphone + l_pocket = /obj/item/megaphone l_hand = /obj/item/martial_manual/tajara /obj/outfit/admin/ert/pra_cosmonaut/tesla @@ -117,7 +117,7 @@ /obj/item/ammo_magazine/c45uzi = 2, /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, - /obj/item/device/flashlight/pen = 1, + /obj/item/flashlight/pen = 1, /obj/item/gun/projectile/pistol/adhomai = 1 ) @@ -129,7 +129,7 @@ /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, /obj/item/reagent_containers/glass/bottle/bicaridine = 1, /obj/item/reagent_containers/glass/bottle/dermaline = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) l_hand = /obj/item/martial_manual/tajara diff --git a/code/datums/outfits/ert/mercenary.dm b/code/datums/outfits/ert/mercenary.dm index 059ea4ffb32..2a33c32980d 100644 --- a/code/datums/outfits/ert/mercenary.dm +++ b/code/datums/outfits/ert/mercenary.dm @@ -14,7 +14,7 @@ glasses = /obj/item/clothing/glasses/sunglasses/aviator l_pocket = /obj/item/tank/emergency_oxygen/double - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -51,7 +51,7 @@ /obj/item/ammo_magazine/c45m = 1, /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1 ) @@ -94,7 +94,7 @@ /obj/item/ammo_magazine/c45m = 2, /obj/item/handcuffs/ziptie = 1, /obj/item/shield/energy = 1, - /obj/item/device/flashlight/flare = 1, + /obj/item/flashlight/flare = 1, ) /obj/outfit/admin/ert/mercenary/leader diff --git a/code/datums/outfits/ert/nt_ert.dm b/code/datums/outfits/ert/nt_ert.dm index ef1448a06b4..47deaf83a3f 100644 --- a/code/datums/outfits/ert/nt_ert.dm +++ b/code/datums/outfits/ert/nt_ert.dm @@ -11,7 +11,7 @@ id = /obj/item/card/id/ert back = /obj/item/rig/ert/security - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert belt_contents = list( /obj/item/handcuffs = 2, diff --git a/code/datums/outfits/ert/qukala.dm b/code/datums/outfits/ert/qukala.dm index 31e762c3ec8..b33139ca07d 100644 --- a/code/datums/outfits/ert/qukala.dm +++ b/code/datums/outfits/ert/qukala.dm @@ -8,7 +8,7 @@ head = /obj/item/clothing/head/helmet/space/void/kala back = /obj/item/storage/backpack/kala suit_store = /obj/item/gun/energy/gun/qukala - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress l_pocket = /obj/item/tank/emergency_oxygen/double id = /obj/item/card/id backpack_contents = list( @@ -53,7 +53,7 @@ B.replaced(H, affectedB) H.update_body() if(H.is_diona()) - H.equip_or_collect(new /obj/item/device/uv_light(src), slot_in_backpack) + H.equip_or_collect(new /obj/item/uv_light(src), slot_in_backpack) if(H?.shoes) var/obj/item/clothing/shoes/magboots/advance/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) @@ -94,7 +94,7 @@ /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/telebaton/nlom = 1, diff --git a/code/datums/outfits/ert/scc_ert.dm b/code/datums/outfits/ert/scc_ert.dm index 71b706de92b..035fc3ef0e5 100644 --- a/code/datums/outfits/ert/scc_ert.dm +++ b/code/datums/outfits/ert/scc_ert.dm @@ -8,7 +8,7 @@ id = /obj/item/card/id/ert/scc back = /obj/item/rig/ert/scc/security - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert belt_contents = list( /obj/item/handcuffs = 2, diff --git a/code/datums/outfits/ert/syndicate.dm b/code/datums/outfits/ert/syndicate.dm index 598ce874563..86f383a6cc2 100644 --- a/code/datums/outfits/ert/syndicate.dm +++ b/code/datums/outfits/ert/syndicate.dm @@ -4,7 +4,7 @@ uniform = /obj/item/clothing/under/syndicate belt = /obj/item/storage/belt/military/syndicate mask = /obj/item/clothing/mask/gas/syndicate - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/thermal id = /obj/item/card/id/syndicate/ert l_pocket = /obj/item/ammo_magazine/c45m diff --git a/code/datums/outfits/ert/tcfl.dm b/code/datums/outfits/ert/tcfl.dm index 83b4cd62028..25e3b3859a4 100644 --- a/code/datums/outfits/ert/tcfl.dm +++ b/code/datums/outfits/ert/tcfl.dm @@ -3,7 +3,7 @@ head = /obj/item/clothing/head/beret/legion/field uniform = /obj/item/clothing/under/legion - l_ear = /obj/item/device/radio/headset/legion + l_ear = /obj/item/radio/headset/legion shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/swat/ert glasses = /obj/item/clothing/glasses/sunglasses/aviator @@ -47,7 +47,7 @@ back = null belt = /obj/item/storage/belt/security/tactical accessory = /obj/item/clothing/accessory/storage/webbingharness/pouches/ert - accessory_contents = list(/obj/item/gun/energy/blaster/pilot_special = 1, /obj/item/device/binoculars = 1) + accessory_contents = list(/obj/item/gun/energy/blaster/pilot_special = 1, /obj/item/binoculars = 1) backpack_contents = null diff --git a/code/datums/outfits/ert/vaurca.dm b/code/datums/outfits/ert/vaurca.dm index 7e78c749170..f6f5ec4cc88 100644 --- a/code/datums/outfits/ert/vaurca.dm +++ b/code/datums/outfits/ert/vaurca.dm @@ -8,7 +8,7 @@ mask = /obj/item/clothing/mask/gas/vaurca/tactical glasses = /obj/item/clothing/glasses/sunglasses/blinders id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress accessory = /obj/item/clothing/accessory/holster/hip accessory_contents = list( /obj/item/gun/energy/vaurca/blaster = 1 @@ -61,7 +61,7 @@ /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/energy/vaurca = 1, @@ -151,7 +151,7 @@ mask = /obj/item/clothing/mask/gas/vaurca/tactical glasses = /obj/item/clothing/glasses/sunglasses/blinders id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress r_pocket = /obj/item/crowbar/red accessory = /obj/item/clothing/accessory/holster/hip r_hand = /obj/item/recharger_backpack/high //so they can charge the hegemony weapons @@ -206,7 +206,7 @@ /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/energy/sword/hegemony = 1, diff --git a/code/datums/outfits/ert/zavod.dm b/code/datums/outfits/ert/zavod.dm index 2372f6b5d4c..a86b82714f9 100644 --- a/code/datums/outfits/ert/zavod.dm +++ b/code/datums/outfits/ert/zavod.dm @@ -6,7 +6,7 @@ suit = /obj/item/clothing/suit/space/void/zavodskoi head = /obj/item/clothing/head/helmet/space/void/zavodskoi belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress id = /obj/item/card/id/zavodskoi mask = /obj/item/clothing/mask/gas/tactical glasses = /obj/item/clothing/glasses/safety/goggles/goon/zavod @@ -46,7 +46,7 @@ /obj/item/ammo_magazine/mc9mm = 2, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/baton/loaded = 1, diff --git a/code/datums/outfits/ert/zenghu.dm b/code/datums/outfits/ert/zenghu.dm index 76cad4697cc..d833af273da 100644 --- a/code/datums/outfits/ert/zenghu.dm +++ b/code/datums/outfits/ert/zenghu.dm @@ -6,7 +6,7 @@ suit = /obj/item/clothing/suit/space/void/zenghu head = /obj/item/clothing/head/helmet/space/void/zenghu belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress id = /obj/item/card/id/zeng_hu mask = /obj/item/clothing/mask/gas/tactical glasses = /obj/item/clothing/glasses/night @@ -19,7 +19,7 @@ ) belt_contents = list( /obj/item/shield/energy = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/flashbang = 2 @@ -39,7 +39,7 @@ /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/melee/baton/loaded = 1, diff --git a/code/datums/outfits/event/outfit_events.dm b/code/datums/outfits/event/outfit_events.dm index 70e8377afd3..01d6bb91b15 100644 --- a/code/datums/outfits/event/outfit_events.dm +++ b/code/datums/outfits/event/outfit_events.dm @@ -5,7 +5,7 @@ back = /obj/item/gun/energy/rifle/pulse gloves = /obj/item/clothing/gloves/force/basic belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert head = /obj/item/clothing/head/helmet/space/void/lancer species_head = list( @@ -28,7 +28,7 @@ /obj/item/grenade/frag = 1, /obj/item/melee/energy/sword = 1, /obj/item/shield/energy = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/empgrenade = 1 @@ -61,7 +61,7 @@ accessory_contents = list( /obj/item/plastique = 3, /obj/item/grenade/frag = 1, - /obj/item/device/flash = 1 + /obj/item/flash = 1 ) id_access = "Lance Engineer" @@ -82,7 +82,7 @@ accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1) belt_contents = list( - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/reagent_containers/hypospray/combat = 1, /obj/item/reagent_containers/syringe = 1, /obj/item/personal_inhaler/combat = 1, @@ -103,7 +103,7 @@ accessory_contents = list(/obj/item/gun/energy/pulse/pistol = 1) backpack_contents = list( - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/clothing/gloves/yellow = 1 ) id_access = "Lance Operative" @@ -117,7 +117,7 @@ uniform = /obj/item/clothing/under/rank/sol shoes = /obj/item/clothing/shoes/magboots gloves = /obj/item/clothing/gloves/combat - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/thermal l_pocket = /obj/item/tank/emergency_oxygen/double r_pocket = /obj/item/crowbar/red diff --git a/code/datums/outfits/event/outfit_generic/mercenary.dm b/code/datums/outfits/event/outfit_generic/mercenary.dm index 62cf63263cb..c5d35640fa4 100644 --- a/code/datums/outfits/event/outfit_generic/mercenary.dm +++ b/code/datums/outfits/event/outfit_generic/mercenary.dm @@ -52,7 +52,7 @@ /obj/item/storage/belt/military, ) belt_contents = list( - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 1, /obj/item/material/knife/tacknife = 1, /obj/item/gun/projectile/pistol = 1, diff --git a/code/datums/outfits/event/outfit_generic/mining.dm b/code/datums/outfits/event/outfit_generic/mining.dm index 807667655b4..8d21a97b658 100644 --- a/code/datums/outfits/event/outfit_generic/mining.dm +++ b/code/datums/outfits/event/outfit_generic/mining.dm @@ -29,7 +29,7 @@ ) belt_contents = list( /obj/item/gun/custom_ka/frame01/prebuilt=1, - /obj/item/device/flashlight/lantern=1, + /obj/item/flashlight/lantern=1, ) head = list( /obj/item/clothing/head/hardhat, diff --git a/code/datums/outfits/event/outfit_killers.dm b/code/datums/outfits/event/outfit_killers.dm index 1df554af4d0..b4ec5ac5041 100644 --- a/code/datums/outfits/event/outfit_killers.dm +++ b/code/datums/outfits/event/outfit_killers.dm @@ -7,7 +7,7 @@ gloves = /obj/item/clothing/gloves/latex mask = /obj/item/clothing/mask/surgical head = /obj/item/clothing/head/welding - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/plain/monocle l_pocket = /obj/item/material/knife r_pocket = /obj/item/surgery/scalpel @@ -27,7 +27,7 @@ suit = /obj/item/clothing/suit/wcoat shoes = /obj/item/clothing/shoes/sneakers/black gloves = /obj/item/clothing/gloves/black - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/sunglasses l_pocket = /obj/item/melee/energy/sword r_pocket = /obj/item/cloaking_device diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm index 5307d622902..33c2baaed6c 100644 --- a/code/datums/outfits/event/outfit_megacorps.dm +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -6,7 +6,7 @@ gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/magboots belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate suit_store = /obj/item/gun/energy/laser suit = /obj/item/clothing/suit/space/void/hephaestus head = /obj/item/clothing/head/helmet/space/void/hephaestus @@ -21,7 +21,7 @@ belt_contents = list( /obj/item/shield/energy = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/flashbang = 2 @@ -49,7 +49,7 @@ gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/magboots belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate suit_store = /obj/item/gun/energy/laser suit = /obj/item/clothing/suit/space/void/zenghu head = /obj/item/clothing/head/helmet/space/void/zenghu @@ -64,7 +64,7 @@ belt_contents = list( /obj/item/shield/energy = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/flashbang = 2 @@ -87,7 +87,7 @@ gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/magboots belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate suit_store = /obj/item/gun/projectile/automatic/wt550 suit = /obj/item/clothing/suit/space/void/zavodskoi head = /obj/item/clothing/head/helmet/space/void/zavodskoi @@ -102,7 +102,7 @@ belt_contents = list( /obj/item/shield/energy = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/flashbang = 2 @@ -139,7 +139,7 @@ shoes = null gloves = null mask = /obj/item/clothing/mask/gas/swat - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical id = /obj/item/card/id/syndicate l_pocket = /obj/item/plastique diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm index afe186fa79c..a6b3927c3b9 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -5,7 +5,7 @@ back = /obj/item/storage/backpack/satchel/leather gloves = /obj/item/clothing/gloves/white shoes = /obj/item/clothing/shoes/laceup - l_ear = /obj/item/device/radio/headset/ert/ccia + l_ear = /obj/item/radio/headset/ert/ccia glasses = /obj/item/clothing/glasses/sunglasses id = /obj/item/card/id @@ -23,17 +23,17 @@ name = "NanoTrasen Navy Officer" uniform = /obj/item/clothing/under/rank/centcom_officer - l_ear = /obj/item/device/radio/headset/heads/captain + l_ear = /obj/item/radio/headset/heads/captain head = /obj/item/clothing/head/beret/centcom/officer - l_pocket = /obj/item/device/orbital_dropper/icarus_drones + l_pocket = /obj/item/orbital_dropper/icarus_drones /obj/outfit/admin/nt/captain name = "NanoTrasen Navy Captain" uniform = /obj/item/clothing/under/rank/centcom_captain - l_ear = /obj/item/device/radio/headset/heads/captain + l_ear = /obj/item/radio/headset/heads/captain head = /obj/item/clothing/head/beret/centcom/captain - l_pocket = /obj/item/device/orbital_dropper/icarus_drones + l_pocket = /obj/item/orbital_dropper/icarus_drones /obj/outfit/admin/nt/protection_detail name = "ERT Protection Detail" @@ -42,7 +42,7 @@ suit = /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/swat/tactical - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/sunglasses/sechud id = /obj/item/card/id/ccia head = /obj/item/clothing/head/beret/centcom/civilprotection @@ -71,8 +71,8 @@ var/obj/item/shield/riot/tact/shield = new(H) var/obj/item/grenade/flashbang/flashbang = new(H) var/obj/item/handcuffs/cuffs = new(H) - var/obj/item/device/flash/flash = new(H) - var/obj/item/device/flashlight/flare/flare = new(H) + var/obj/item/flash/flash = new(H) + var/obj/item/flashlight/flare/flare = new(H) H.belt.contents += flare H.belt.contents += flashbang @@ -90,14 +90,14 @@ suit = /obj/item/clothing/suit/storage/vest/heavy/ert/commander shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/white - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/sunglasses/sechud head = /obj/item/clothing/head/beret/centcom/commander backpack_contents = list( /obj/item/storage/box/fancy/cigarettes/cigar = 1, /obj/item/flame/lighter/zippo = 1, - /obj/item/device/orbital_dropper/icarus_drones = 1 + /obj/item/orbital_dropper/icarus_drones = 1 ) implants = list( @@ -112,17 +112,17 @@ uniform = /obj/item/clothing/under/rank/centcom_officer shoes = /obj/item/clothing/shoes/laceup gloves = /obj/item/clothing/gloves/white - l_ear = /obj/item/device/radio/headset/ert/ccia + l_ear = /obj/item/radio/headset/ert/ccia glasses = /obj/item/clothing/glasses/sunglasses/sechud head = /obj/item/clothing/head/beret/centcom/officer l_pocket = /obj/item/reagent_containers/spray/pepper - r_pocket = /obj/item/device/taperecorder/cciaa + r_pocket = /obj/item/taperecorder/cciaa l_hand = /obj/item/storage/lockbox/cciaa pda = /obj/item/modular_computer/handheld/pda/command/cciaa id = /obj/item/card/id/ccia backpack_contents = list( - /obj/item/device/memorywiper = 1 + /obj/item/memorywiper = 1 ) id_icon = "ccia" @@ -134,7 +134,7 @@ uniform = /obj/item/clothing/under/suit_jacket/nt_skirtsuit shoes = /obj/item/clothing/shoes/flats wrist = /obj/item/clothing/wrists/watch/gold - l_ear = /obj/item/device/radio/headset/ert/ccia + l_ear = /obj/item/radio/headset/ert/ccia id = /obj/item/card/id/ccia l_pocket = /obj/item/reagent_containers/spray/pepper @@ -145,7 +145,7 @@ suit = /obj/item/clothing/suit/storage/vest/heavy/ert/peacekeeper shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/swat/tactical - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical mask = /obj/item/clothing/mask/gas/tactical head = /obj/item/clothing/head/helmet/swat/peacekeeper @@ -161,7 +161,7 @@ /obj/item/reagent_containers/spray/pepper = 1, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/chem_grenade/gas = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/ammo_magazine/c45m/auto = 2 ) @@ -189,7 +189,7 @@ suit = /obj/item/clothing/suit/armor/swat/officer shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/eyepatch/hud/thermal mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana head = /obj/item/clothing/head/helmet/space/deathsquad/beret @@ -210,7 +210,7 @@ gloves = /obj/item/clothing/gloves/black l_pocket = /obj/item/reagent_containers/spray/pepper - r_pocket = /obj/item/device/taperecorder/cciaa + r_pocket = /obj/item/taperecorder/cciaa l_hand = /obj/item/storage/lockbox/cciaa/bssb id = /obj/item/card/id/ccia/bssb @@ -219,7 +219,7 @@ backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs = 1 ) @@ -248,7 +248,7 @@ r_pocket = null l_hand = null belt_contents = list( - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/melee/baton/loaded = 1, /obj/item/handcuffs = 2, /obj/item/ammo_magazine/c45m = 2 @@ -276,8 +276,8 @@ shoes = /obj/item/clothing/shoes/sneakers/black mask = /obj/item/clothing/mask/surgical l_hand = /obj/item/storage/firstaid/adv - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/white @@ -292,7 +292,7 @@ /obj/item/storage/firstaid/surgery = 1, /obj/item/storage/box/gloves = 1, /obj/item/storage/box/syringes = 1, - /obj/item/device/flashlight/pen = 1 + /obj/item/flashlight/pen = 1 ) belt_contents = list( @@ -313,8 +313,8 @@ uniform = /obj/item/clothing/under/rank/medical/pharmacist suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt shoes = /obj/item/clothing/shoes/sneakers/medsci - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt glasses = /obj/item/clothing/glasses/hud/health backpack = /obj/item/storage/backpack/pharmacy @@ -329,8 +329,8 @@ uniform = /obj/item/clothing/under/rank/bartender shoes = /obj/item/clothing/shoes/laceup - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt id_access = "Service" @@ -341,8 +341,8 @@ suit = /obj/item/clothing/suit/chef_jacket head = /obj/item/clothing/head/chefhat shoes = /obj/item/clothing/shoes/laceup - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt id_access = "Service" @@ -352,8 +352,8 @@ uniform = /obj/item/clothing/under/rank/janitor pda = /obj/item/modular_computer/handheld/pda/civilian shoes = /obj/item/clothing/shoes/galoshes - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt l_pocket = /obj/item/grenade/chem_grenade/cleaner r_pocket = /obj/item/grenade/chem_grenade/cleaner diff --git a/code/datums/outfits/event/outfit_scc.dm b/code/datums/outfits/event/outfit_scc.dm index 18cbbc19004..281a4c60152 100644 --- a/code/datums/outfits/event/outfit_scc.dm +++ b/code/datums/outfits/event/outfit_scc.dm @@ -4,12 +4,12 @@ uniform = /obj/item/clothing/under/rank/scc back = /obj/item/storage/backpack/satchel/leather shoes = /obj/item/clothing/shoes/laceup - l_ear = /obj/item/device/radio/headset/ert/ccia + l_ear = /obj/item/radio/headset/ert/ccia glasses = /obj/item/clothing/glasses/sunglasses wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/command l_pocket = /obj/item/reagent_containers/spray/pepper - r_pocket = /obj/item/device/taperecorder/cciaa + r_pocket = /obj/item/taperecorder/cciaa id = /obj/item/card/id @@ -36,12 +36,12 @@ head = /obj/item/clothing/head/helmet/merc/scc uniform = /obj/item/clothing/under/tactical suit = /obj/item/clothing/suit/armor/carrier/heavy/scc - l_ear = /obj/item/device/radio/headset/ert/ccia/alt + l_ear = /obj/item/radio/headset/ert/ccia/alt shoes = /obj/item/clothing/shoes/jackboots wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/security l_pocket = /obj/item/shield/energy - r_pocket = /obj/item/device/radio + r_pocket = /obj/item/radio accessory = /obj/item/clothing/accessory/holster/armpit accessory_contents = list(/obj/item/gun/energy/repeater) @@ -51,7 +51,7 @@ /obj/item/reagent_containers/spray/pepper = 1, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/chem_grenade/gas = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2 ) diff --git a/code/datums/outfits/event/outfit_siib.dm b/code/datums/outfits/event/outfit_siib.dm index 3b69a0fd9f5..a0e8f942278 100644 --- a/code/datums/outfits/event/outfit_siib.dm +++ b/code/datums/outfits/event/outfit_siib.dm @@ -5,7 +5,7 @@ shoes = /obj/item/clothing/shoes/laceup gloves = /obj/item/clothing/gloves/black glasses = /obj/item/clothing/glasses/sunglasses/sechud - l_ear = /obj/item/device/radio/headset/ert/siib + l_ear = /obj/item/radio/headset/ert/siib back = /obj/item/storage/backpack/satchel/leather r_pocket = /obj/item/ammo_magazine/mc9mm @@ -14,7 +14,7 @@ backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/handcuffs/ziptie = 2 ) id = null @@ -30,7 +30,7 @@ suit_store = /obj/item/gun/projectile/automatic/c20r/sol/siib mask = /obj/item/clothing/mask/balaclava belt = /obj/item/storage/belt/military - l_ear = /obj/item/device/radio/headset/ert/siib + l_ear = /obj/item/radio/headset/ert/siib head = /obj/item/clothing/head/helmet/merc back = /obj/item/storage/backpack/satchel/leather r_pocket = /obj/item/ammo_magazine/mc9mm @@ -46,7 +46,7 @@ backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/crowbar/red = 1, /obj/item/handcuffs/ziptie = 2 ) diff --git a/code/datums/outfits/event/outfit_tfcl.dm b/code/datums/outfits/event/outfit_tfcl.dm index ed3fe8fd70f..dcb79d28597 100644 --- a/code/datums/outfits/event/outfit_tfcl.dm +++ b/code/datums/outfits/event/outfit_tfcl.dm @@ -5,7 +5,7 @@ suit = /obj/item/clothing/suit/storage/vest/legion/legate gloves = /obj/item/clothing/gloves/swat/tactical shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/device/radio/headset/legion + l_ear = /obj/item/radio/headset/legion head = /obj/item/clothing/head/legion/legate glasses = /obj/item/clothing/glasses/sunglasses/aviator id = /obj/item/card/id/distress/legion diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 0473e923cbb..05c5cbd6579 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -84,11 +84,11 @@ var/wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian var/allow_headset_choice = FALSE - var/headset = /obj/item/device/radio/headset - var/bowman = /obj/item/device/radio/headset/alt - var/double_headset = /obj/item/device/radio/headset/alt/double - var/wrist_radio = /obj/item/device/radio/headset/wrist - var/clipon_radio = /obj/item/device/radio/headset/wrist/clip + var/headset = /obj/item/radio/headset + var/bowman = /obj/item/radio/headset/alt + var/double_headset = /obj/item/radio/headset/alt/double + var/wrist_radio = /obj/item/radio/headset/wrist + var/clipon_radio = /obj/item/radio/headset/wrist/clip /// When spawning in, the ID will be set to this iff, preventing friendly fire. var/id_iff = IFF_DEFAULT @@ -325,7 +325,7 @@ else if (wrist) equip_item(H, wrist, slot_wrists, callback = radio_callback) -/obj/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio) +/obj/outfit/proc/turn_into_thinset(var/obj/item/radio/headset/wrist/radio) if(istype(radio)) radio.icon_state = replacetext(radio.icon_state, "wrist", "thin") radio.item_state = replacetext(radio.item_state, "wrist", "thin") diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 62cfe3895e9..29b056dcb35 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -57,8 +57,8 @@ uniform = "suit selection" shoes = "shoe selection" l_ear = list( - /obj/item/device/radio/headset, - /obj/item/device/radio/headset/alt, + /obj/item/radio/headset, + /obj/item/radio/headset/alt, ) back = list( /obj/item/storage/backpack, diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index ba4f6b567dd..9968a383bed 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -14,15 +14,15 @@ belt = /obj/item/storage/belt/utility/full gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/device/radio/headset/syndicate/alt + l_ear = /obj/item/radio/headset/syndicate/alt id = /obj/item/card/id/syndicate - r_pocket = /obj/item/device/radio/uplink + r_pocket = /obj/item/radio/uplink backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, - /obj/item/device/flashlight = 1, + /obj/item/flashlight = 1, /obj/item/card/emag = 1, /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1, - /obj/item/device/multitool = 1 + /obj/item/multitool = 1 ) id_iff = IFF_SYNDICATE @@ -35,7 +35,7 @@ if(visualsOnly) return - var/obj/item/device/radio/uplink/U = H.r_store + var/obj/item/radio/uplink/U = H.r_store if(istype(U)) U.hidden_uplink.uplink_owner = H.mind U.hidden_uplink.telecrystals = uplink_uses @@ -57,7 +57,7 @@ belt = /obj/item/storage/belt/military/syndicate head = /obj/item/clothing/head/helmet/space/void/merc mask = /obj/item/clothing/mask/gas/syndicate - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/night shoes = /obj/item/clothing/shoes/magboots/syndie l_pocket = /obj/item/pinpointer/nukeop @@ -71,7 +71,7 @@ /obj/item/crowbar/red = 1, /obj/item/plastique = 1, /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1, - /obj/item/device/flashlight = 1, + /obj/item/flashlight = 1, /obj/item/clothing/shoes/combat = 1 ) @@ -81,13 +81,13 @@ head = /obj/item/clothing/head/beret/red mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana belt = /obj/item/gun/projectile/deagle - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate l_pocket = /obj/item/pinpointer/advpinpointer r_pocket = null // stop them getting a radio uplink, they get an implant instead backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, - /obj/item/device/flashlight = 1, + /obj/item/flashlight = 1, /obj/item/reagent_containers/pill/cyanide = 1, /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 1, /obj/item/ammo_magazine/a50 = 2, @@ -123,7 +123,7 @@ shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/ring/ninja mask = /obj/item/clothing/mask/balaclava - l_ear = /obj/item/device/radio/headset/ninja + l_ear = /obj/item/radio/headset/ninja glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical id = /obj/item/card/id/syndicate l_pocket = null @@ -133,10 +133,10 @@ backpack_contents = list() belt_contents = list( - /obj/item/device/flashlight/maglight = 1, + /obj/item/flashlight/maglight = 1, /obj/item/crowbar = 1, /obj/item/screwdriver = 1, - /obj/item/device/paicard = 1 + /obj/item/paicard = 1 ) id_access = "Syndicate Agent" @@ -146,7 +146,7 @@ if(visualsOnly) return - H.equip_to_slot_or_del(new /obj/item/device/special_uplink/ninja(H, H.mind), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/special_uplink/ninja(H, H.mind), slot_l_store) /obj/outfit/admin/syndicate/mercenary name = "Mercenary" @@ -156,7 +156,7 @@ gloves = /obj/item/clothing/gloves/swat shoes = /obj/item/clothing/shoes/jackboots pda = /obj/item/modular_computer/handheld/pda/syndicate - r_pocket = /obj/item/device/special_uplink/mercenary + r_pocket = /obj/item/special_uplink/mercenary backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, @@ -176,13 +176,13 @@ /obj/outfit/admin/syndicate/mercenary/loner name = "Loner" - l_ear = /obj/item/device/radio/headset/syndicate - r_pocket = /obj/item/device/special_uplink/burglar + l_ear = /obj/item/radio/headset/syndicate + r_pocket = /obj/item/special_uplink/burglar backpack_contents = list( /obj/item/storage/box/syndie_kit/space = 1, /obj/item/gun/projectile/shotgun/foldable = 1, - /obj/item/device/multitool/hacktool = 1 + /obj/item/multitool/hacktool = 1 ) id_iff = IFF_LONER @@ -320,8 +320,8 @@ /obj/item/clothing/glasses/sunglasses/big, /obj/item/clothing/glasses/sunglasses/visor ) - l_ear = /obj/item/device/radio/headset/raider - l_pocket = /obj/item/device/special_uplink/raider + l_ear = /obj/item/radio/headset/raider + l_pocket = /obj/item/special_uplink/raider r_pocket = list( /obj/item/clothing/glasses/eyepatch/hud/thermal, /obj/item/clothing/glasses/thermal, @@ -420,9 +420,9 @@ /obj/item/clothing/wrists/watch/spy ) - l_ear = /obj/item/device/radio/headset/burglar + l_ear = /obj/item/radio/headset/burglar l_pocket = /obj/item/syndie/teleporter - r_pocket = /obj/item/device/special_uplink/burglar + r_pocket = /obj/item/special_uplink/burglar id = /obj/item/storage/wallet r_hand = /obj/item/storage/briefcase/black @@ -515,12 +515,12 @@ backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, - /obj/item/device/flashlight = 1, + /obj/item/flashlight = 1, /obj/item/card/emag = 1 ) - l_ear = /obj/item/device/radio/headset/jockey - r_pocket = /obj/item/device/special_uplink/jockey + l_ear = /obj/item/radio/headset/jockey + r_pocket = /obj/item/special_uplink/jockey id = /obj/item/storage/wallet id_iff = IFF_JOCKEY @@ -555,7 +555,7 @@ uniform = /obj/item/clothing/under/kilt head = /obj/item/clothing/head/beret/red shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/device/radio/headset/heads/captain + l_ear = /obj/item/radio/headset/heads/captain l_hand = /obj/item/material/sword l_pocket = /obj/item/pinpointer @@ -614,7 +614,7 @@ belt = /obj/item/storage/belt/fannypack/component gloves = null - l_ear = /obj/item/device/radio/headset/bluespace + l_ear = /obj/item/radio/headset/bluespace l_pocket = /obj/item/technomancer_catalog/apprentice r_pocket = null id = /obj/item/storage/wallet/random @@ -693,7 +693,7 @@ name = "Bluespace Golem" allow_backbag_choice = FALSE - l_ear = /obj/item/device/radio/headset/bluespace + l_ear = /obj/item/radio/headset/bluespace id_iff = IFF_BLUESPACE /obj/outfit/admin/techomancer @@ -701,10 +701,10 @@ allow_backbag_choice = FALSE head = /obj/item/clothing/head/chameleon/technomancer - l_ear = /obj/item/device/radio/headset/bluespace + l_ear = /obj/item/radio/headset/bluespace uniform = /obj/item/clothing/under/chameleon/technomancer suit = /obj/item/clothing/suit/chameleon/technomancer - belt = /obj/item/device/flashlight + belt = /obj/item/flashlight back = /obj/item/technomancer_core shoes = /obj/item/clothing/shoes/chameleon/technomancer @@ -760,7 +760,7 @@ name = "Technomancer Golem" head = null - l_ear = /obj/item/device/radio/headset/bluespace + l_ear = /obj/item/radio/headset/bluespace uniform = null suit = null belt = null diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm index a07f52d564b..39a94b6d441 100644 --- a/code/datums/trading/ai.dm +++ b/code/datums/trading/ai.dm @@ -24,49 +24,49 @@ "bribe_refusal" = "You have given me money to stay, however, I am a station. I do not leave." ) possible_wanted_items = list( - /obj/item/device/ = TRADER_SUBTYPES_ONLY, - /obj/item/device/kit = TRADER_BLACKLIST_ALL, // They're impossible to make or get outside of mining, just annoys traders. - /obj/item/device/assembly = TRADER_BLACKLIST_ALL, - /obj/item/device/assembly_holder = TRADER_BLACKLIST_ALL, - /obj/item/device/encryptionkey = TRADER_BLACKLIST_SUB, //Why should ai want NT encryption keys? - /obj/item/device/radio = TRADER_BLACKLIST_ALL, - /obj/item/device/chameleon = TRADER_BLACKLIST, // Why should it want a chameleon projector - /obj/item/device/dociler = TRADER_BLACKLIST, //Item unobtaineable - /obj/item/device/flashlight/drone = TRADER_BLACKLIST, // No drone stuff - /obj/item/device/camera_bug = TRADER_BLACKLIST, // Traitor stuff - /obj/item/device/multitool = TRADER_BLACKLIST_SUB, // Hacktool, uplink and robo tool ban - /obj/item/device/modkit = TRADER_BLACKLIST_ALL, // No to modkits - /obj/item/device/pin_extractor = TRADER_BLACKLIST, // RD's tech - /obj/item/device/powersink = TRADER_BLACKLIST, // Traitor stuff - /obj/item/device/slime_scanner = TRADER_BLACKLIST, //If it was doing slime stuff, it already had this - /obj/item/device/spy_bug = TRADER_BLACKLIST, // Traitor stuff - /obj/item/device/spy_monitor = TRADER_BLACKLIST, // Traitor stuff - /obj/item/device/suit_cooling_unit = TRADER_BLACKLIST, // Not on Aurora - /obj/item/device/taperecorder/cciaa = TRADER_BLACKLIST, // Admin item - /obj/item/device/batterer = TRADER_BLACKLIST, // Item too rare - /obj/item/device/contract_uplink = TRADER_BLACKLIST, // Traitor stuff - /obj/item/device/uplink = TRADER_BLACKLIST_ALL, // Traitor stuff - /obj/item/device/announcer = TRADER_BLACKLIST, // Rev item - /obj/item/device/special_uplink = TRADER_BLACKLIST, - /obj/item/device/onetankbomb = TRADER_BLACKLIST, // Not weapons trader - /obj/item/device/kinetic_analyzer = TRADER_BLACKLIST, // Not KA trader - /obj/item/device/camera = TRADER_BLACKLIST_SUB, // a lot of ai/drone/cyborg/fluff items - /obj/item/device/uv_light = TRADER_BLACKLIST, // CSI item - /obj/item/device/eftpos = TRADER_BLACKLIST, - /obj/item/device/quikpay = TRADER_BLACKLIST, - /obj/item/device/electronic_assembly = TRADER_BLACKLIST_ALL, // Not a circuit trader - /obj/item/device/integrated_circuit_printer = TRADER_BLACKLIST_ALL, //Not a circuit trader - /obj/item/device/integrated_electronics = TRADER_BLACKLIST_ALL, // Not a circuit trader - /obj/item/device/mine_bot_upgrade = TRADER_BLACKLIST_ALL, // Not a mining vendor + drone stuff - /obj/item/device/mmi = TRADER_BLACKLIST_SUB, // removes MMI Subtypes to prevent trading confusion - /obj/item/device/soulstone = TRADER_BLACKLIST, // Wiz item - /obj/item/device/firing_pin = TRADER_BLACKLIST_ALL, // Not a weapons trader - /obj/item/device/laser_assembly = TRADER_BLACKLIST_ALL, // Not a weapons trader - /obj/item/device/ano_scanner = TRADER_BLACKLIST, // Xenoarch - /obj/item/device/core_sampler = TRADER_BLACKLIST, // Xenoarch - /obj/item/device/depth_scanner = TRADER_BLACKLIST, // Xenoarch - /obj/item/device/beacon_locator = TRADER_BLACKLIST, // Telescience - /obj/item/device/telepad_beacon = TRADER_BLACKLIST, // Telescience + /obj/item/ = TRADER_SUBTYPES_ONLY, + /obj/item/kit = TRADER_BLACKLIST_ALL, // They're impossible to make or get outside of mining, just annoys traders. + /obj/item/assembly = TRADER_BLACKLIST_ALL, + /obj/item/assembly_holder = TRADER_BLACKLIST_ALL, + /obj/item/encryptionkey = TRADER_BLACKLIST_SUB, //Why should ai want NT encryption keys? + /obj/item/radio = TRADER_BLACKLIST_ALL, + /obj/item/chameleon = TRADER_BLACKLIST, // Why should it want a chameleon projector + /obj/item/dociler = TRADER_BLACKLIST, //Item unobtaineable + /obj/item/flashlight/drone = TRADER_BLACKLIST, // No drone stuff + /obj/item/camera_bug = TRADER_BLACKLIST, // Traitor stuff + /obj/item/multitool = TRADER_BLACKLIST_SUB, // Hacktool, uplink and robo tool ban + /obj/item/modkit = TRADER_BLACKLIST_ALL, // No to modkits + /obj/item/pin_extractor = TRADER_BLACKLIST, // RD's tech + /obj/item/powersink = TRADER_BLACKLIST, // Traitor stuff + /obj/item/slime_scanner = TRADER_BLACKLIST, //If it was doing slime stuff, it already had this + /obj/item/spy_bug = TRADER_BLACKLIST, // Traitor stuff + /obj/item/spy_monitor = TRADER_BLACKLIST, // Traitor stuff + /obj/item/suit_cooling_unit = TRADER_BLACKLIST, // Not on Aurora + /obj/item/taperecorder/cciaa = TRADER_BLACKLIST, // Admin item + /obj/item/batterer = TRADER_BLACKLIST, // Item too rare + /obj/item/contract_uplink = TRADER_BLACKLIST, // Traitor stuff + /obj/item/uplink = TRADER_BLACKLIST_ALL, // Traitor stuff + /obj/item/announcer = TRADER_BLACKLIST, // Rev item + /obj/item/special_uplink = TRADER_BLACKLIST, + /obj/item/onetankbomb = TRADER_BLACKLIST, // Not weapons trader + /obj/item/kinetic_analyzer = TRADER_BLACKLIST, // Not KA trader + /obj/item/camera = TRADER_BLACKLIST_SUB, // a lot of ai/drone/cyborg/fluff items + /obj/item/uv_light = TRADER_BLACKLIST, // CSI item + /obj/item/eftpos = TRADER_BLACKLIST, + /obj/item/quikpay = TRADER_BLACKLIST, + /obj/item/electronic_assembly = TRADER_BLACKLIST_ALL, // Not a circuit trader + /obj/item/integrated_circuit_printer = TRADER_BLACKLIST_ALL, //Not a circuit trader + /obj/item/integrated_electronics = TRADER_BLACKLIST_ALL, // Not a circuit trader + /obj/item/mine_bot_upgrade = TRADER_BLACKLIST_ALL, // Not a mining vendor + drone stuff + /obj/item/mmi = TRADER_BLACKLIST_SUB, // removes MMI Subtypes to prevent trading confusion + /obj/item/soulstone = TRADER_BLACKLIST, // Wiz item + /obj/item/firing_pin = TRADER_BLACKLIST_ALL, // Not a weapons trader + /obj/item/laser_assembly = TRADER_BLACKLIST_ALL, // Not a weapons trader + /obj/item/ano_scanner = TRADER_BLACKLIST, // Xenoarch + /obj/item/core_sampler = TRADER_BLACKLIST, // Xenoarch + /obj/item/depth_scanner = TRADER_BLACKLIST, // Xenoarch + /obj/item/beacon_locator = TRADER_BLACKLIST, // Telescience + /obj/item/telepad_beacon = TRADER_BLACKLIST, // Telescience ) possible_trading_items = list( @@ -151,8 +151,8 @@ /obj/item/storage/firstaid = TRADER_SUBTYPES_ONLY, /obj/item/storage/pill_bottle = TRADER_SUBTYPES_ONLY, /obj/item/reagent_containers/hypospray = TRADER_ALL, - /obj/item/device/healthanalyzer = TRADER_THIS_TYPE, - /obj/item/device/breath_analyzer = TRADER_THIS_TYPE, + /obj/item/healthanalyzer = TRADER_THIS_TYPE, + /obj/item/breath_analyzer = TRADER_THIS_TYPE, /obj/item/stack/medical/bruise_pack = TRADER_THIS_TYPE, /obj/item/stack/medical/ointment = TRADER_THIS_TYPE, /obj/item/stack/medical/advanced = TRADER_SUBTYPES_ONLY, diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm index 57aa3e8c22f..a1d4da65bf3 100644 --- a/code/datums/trading/goods.dm +++ b/code/datums/trading/goods.dm @@ -213,43 +213,43 @@ Sells devices, odds and ends, and medical stuff origin = "Wally's SmartMart" possible_origins = list("Buy 'n Save", "Drug Carnival", "C&B", "Fentles", "Dr. Goods", "Beevees") possible_trading_items = list( - /obj/item/device/flashlight = TRADER_ALL, + /obj/item/flashlight = TRADER_ALL, /obj/item/aicard = TRADER_THIS_TYPE, - /obj/item/device/binoculars = TRADER_THIS_TYPE, - /obj/item/device/flash = TRADER_THIS_TYPE, - /obj/item/device/paint_sprayer = TRADER_THIS_TYPE, - /obj/item/device/multitool = TRADER_THIS_TYPE, - /obj/item/device/lightreplacer = TRADER_THIS_TYPE, - /obj/item/device/megaphone = TRADER_THIS_TYPE, - /obj/item/device/paicard = TRADER_THIS_TYPE, - /obj/item/device/pipe_painter = TRADER_THIS_TYPE, - /obj/item/device/healthanalyzer = TRADER_THIS_TYPE, - /obj/item/device/breath_analyzer = TRADER_THIS_TYPE, - /obj/item/device/analyzer = TRADER_ALL, - /obj/item/device/mass_spectrometer = TRADER_ALL, - /obj/item/device/reagent_scanner = TRADER_ALL, - /obj/item/device/slime_scanner = TRADER_THIS_TYPE, - /obj/item/device/suit_cooling_unit = TRADER_THIS_TYPE, - /obj/item/device/t_scanner = TRADER_THIS_TYPE, - /obj/item/device/taperecorder = TRADER_THIS_TYPE, - /obj/item/device/batterer = TRADER_THIS_TYPE, - /obj/item/device/synthesized_instrument/violin = TRADER_THIS_TYPE, - /obj/item/device/synthesized_instrument/guitar = TRADER_THIS_TYPE, - /obj/item/device/synthesized_instrument/trumpet = TRADER_THIS_TYPE, - /obj/item/device/hailer = TRADER_THIS_TYPE, - /obj/item/device/uv_light = TRADER_THIS_TYPE, - /obj/item/device/mmi = TRADER_ALL, - /obj/item/device/robotanalyzer = TRADER_THIS_TYPE, - /obj/item/device/toner = TRADER_THIS_TYPE, - /obj/item/device/camera_film = TRADER_THIS_TYPE, - /obj/item/device/camera = TRADER_THIS_TYPE, - /obj/item/device/destTagger = TRADER_THIS_TYPE, - /obj/item/device/gps = TRADER_THIS_TYPE, - /obj/item/device/measuring_tape = TRADER_THIS_TYPE, - /obj/item/device/ano_scanner = TRADER_THIS_TYPE, - /obj/item/device/core_sampler = TRADER_THIS_TYPE, - /obj/item/device/depth_scanner = TRADER_THIS_TYPE, - /obj/item/device/beacon_locator = TRADER_THIS_TYPE, + /obj/item/binoculars = TRADER_THIS_TYPE, + /obj/item/flash = TRADER_THIS_TYPE, + /obj/item/paint_sprayer = TRADER_THIS_TYPE, + /obj/item/multitool = TRADER_THIS_TYPE, + /obj/item/lightreplacer = TRADER_THIS_TYPE, + /obj/item/megaphone = TRADER_THIS_TYPE, + /obj/item/paicard = TRADER_THIS_TYPE, + /obj/item/pipe_painter = TRADER_THIS_TYPE, + /obj/item/healthanalyzer = TRADER_THIS_TYPE, + /obj/item/breath_analyzer = TRADER_THIS_TYPE, + /obj/item/analyzer = TRADER_ALL, + /obj/item/mass_spectrometer = TRADER_ALL, + /obj/item/reagent_scanner = TRADER_ALL, + /obj/item/slime_scanner = TRADER_THIS_TYPE, + /obj/item/suit_cooling_unit = TRADER_THIS_TYPE, + /obj/item/t_scanner = TRADER_THIS_TYPE, + /obj/item/taperecorder = TRADER_THIS_TYPE, + /obj/item/batterer = TRADER_THIS_TYPE, + /obj/item/synthesized_instrument/violin = TRADER_THIS_TYPE, + /obj/item/synthesized_instrument/guitar = TRADER_THIS_TYPE, + /obj/item/synthesized_instrument/trumpet = TRADER_THIS_TYPE, + /obj/item/hailer = TRADER_THIS_TYPE, + /obj/item/uv_light = TRADER_THIS_TYPE, + /obj/item/mmi = TRADER_ALL, + /obj/item/robotanalyzer = TRADER_THIS_TYPE, + /obj/item/toner = TRADER_THIS_TYPE, + /obj/item/camera_film = TRADER_THIS_TYPE, + /obj/item/camera = TRADER_THIS_TYPE, + /obj/item/destTagger = TRADER_THIS_TYPE, + /obj/item/gps = TRADER_THIS_TYPE, + /obj/item/measuring_tape = TRADER_THIS_TYPE, + /obj/item/ano_scanner = TRADER_THIS_TYPE, + /obj/item/core_sampler = TRADER_THIS_TYPE, + /obj/item/depth_scanner = TRADER_THIS_TYPE, + /obj/item/beacon_locator = TRADER_THIS_TYPE, /obj/item/stack/medical/advanced = TRADER_BLACKLIST ) @@ -283,7 +283,7 @@ Sells devices, odds and ends, and medical stuff ) possible_trading_items = list( - /obj/item/device/paicard = TRADER_THIS_TYPE, + /obj/item/paicard = TRADER_THIS_TYPE, /obj/item/aicard = TRADER_THIS_TYPE, /mob/living/bot = TRADER_SUBTYPES_ONLY ) @@ -341,7 +341,7 @@ Sells devices, odds and ends, and medical stuff /obj/item/rfd_ammo = TRADER_THIS_TYPE, /obj/item/rfd/mining = TRADER_THIS_TYPE, /obj/item/ore_radar = TRADER_THIS_TYPE, - /obj/item/device/wormhole_jaunter = TRADER_THIS_TYPE, + /obj/item/wormhole_jaunter = TRADER_THIS_TYPE, /obj/item/resonator = TRADER_ALL, /obj/item/autochisel = TRADER_ALL, /obj/structure/sculpting_block = TRADER_ALL, diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 26d53781d3b..7290dd51577 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -64,7 +64,7 @@ /mob/living/simple_animal/corgi/fox = TRADER_THIS_TYPE, /mob/living/simple_animal/hostile/retaliate/goat = TRADER_THIS_TYPE, /mob/living/simple_animal/hostile/commanded/dog = TRADER_ALL, - /obj/item/device/dociler = TRADER_THIS_TYPE + /obj/item/dociler = TRADER_THIS_TYPE ) /datum/trader/prank_shop @@ -285,7 +285,7 @@ /obj/item/clothing/shoes/tajara/fancy = TRADER_THIS_TYPE, /obj/item/clothing/head/beret/tajaran/nka/officer = TRADER_THIS_TYPE, /obj/item/clothing/shoes/tajara/fancy = TRADER_THIS_TYPE, - /obj/item/device/versebook/nka = TRADER_THIS_TYPE, + /obj/item/versebook/nka = TRADER_THIS_TYPE, /obj/item/clothing/wrists/watch/pocketwatch/adhomai = TRADER_THIS_TYPE, /obj/item/clothing/head/helmet/amohda = TRADER_THIS_TYPE, /obj/item/clothing/suit/armor/amohda = TRADER_THIS_TYPE, diff --git a/code/datums/trading/unique.dm b/code/datums/trading/unique.dm index 7c8a178d6ac..ec5e2fb0ec1 100644 --- a/code/datums/trading/unique.dm +++ b/code/datums/trading/unique.dm @@ -150,7 +150,7 @@ /obj/machinery/bluespacerelay = TRADER_ALL, /obj/item/stack/telecrystal = TRADER_THIS_TYPE, /obj/item/organ/internal/brain/golem = TRADER_THIS_TYPE, - /obj/item/device/soulstone = TRADER_THIS_TYPE, + /obj/item/soulstone = TRADER_THIS_TYPE, /obj/item/circuitboard/telesci_console = TRADER_THIS_TYPE, /obj/item/circuitboard/telesci_pad = TRADER_THIS_TYPE, /obj/item/phylactery = TRADER_THIS_TYPE, diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index f4bd6d0d774..70a5a081736 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -4,7 +4,7 @@ /datum/uplink_item/abstract/announcements category = /datum/uplink_category/services -/datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/abstract/announcements/buy(var/obj/item/uplink/U, var/mob/user) . = ..() if(.) log_and_message_admins("has triggered a falsified [src]", user) @@ -25,7 +25,7 @@ return return list("title" = strip_html_readd_newlines(title), "message" = strip_html_readd_newlines(message)) -/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/arguments) +/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user, var/list/arguments) command_announcement.Announce(arguments["message"], arguments["title"], do_newscast=1, do_print=1, msg_sanitized=TRUE) return TRUE @@ -35,7 +35,7 @@ telecrystal_cost = 4 bluecrystal_cost = 4 -/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/arguments) +/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user, var/list/arguments) if(!user) return 0 @@ -94,7 +94,7 @@ telecrystal_cost = 2 var/static/cooldown = FALSE -/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/uplink/U, var/loc) if(cooldown != TRUE) ion_storm_announcement() cooldown = TRUE @@ -117,7 +117,7 @@ telecrystal_cost = 3 var/static/cooldown = 0 -/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/uplink/U, var/loc) if(cooldown != TRUE) var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0) new/datum/event/radiation_storm/syndicate(EM) diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm index 8ba5b670338..b5923f80c54 100644 --- a/code/datums/uplink/badassery.dm +++ b/code/datums/uplink/badassery.dm @@ -26,11 +26,11 @@ name = "Random Item" desc = "Buys you one random item." -/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/uplink/U, var/mob/user) var/datum/uplink_item/item = GLOB.default_uplink_selection.get_random_item(U.telecrystals) return item.buy(U, user) -/datum/uplink_item/item/badassery/random_one/can_buy_telecrystals(obj/item/device/uplink/U) +/datum/uplink_item/item/badassery/random_one/can_buy_telecrystals(obj/item/uplink/U) return GLOB.default_uplink_selection.get_random_item(U.telecrystals, U) != null /datum/uplink_item/item/badassery/random_many @@ -40,7 +40,7 @@ /datum/uplink_item/item/badassery/random_many/telecrystal_cost(var/telecrystals) return max(1, telecrystals) -/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/uplink/U, var/loc) var/list/bought_items = list() for(var/datum/uplink_item/UI in get_random_uplink_items(U, U.telecrystals, loc)) UI.purchase_log(U) @@ -50,7 +50,7 @@ return bought_items -/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U) +/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/uplink/U) feedback_add_details("traitor_uplink_items_bought", "[src]") log_and_message_admins("used \the [U.loc] to buy \a [src]") @@ -68,7 +68,7 @@ ..() desc = "A crate containing [item_worth] telecrystal\s worth of surplus leftovers." -/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/uplink/U, var/loc) var/obj/structure/largecrate/C = new(loc) var/random_items = get_random_uplink_items(null, item_worth, C) for(var/datum/uplink_item/I in random_items) diff --git a/code/datums/uplink/devices_and_tools.dm b/code/datums/uplink/devices_and_tools.dm index ebfb7512198..384f6237e49 100644 --- a/code/datums/uplink/devices_and_tools.dm +++ b/code/datums/uplink/devices_and_tools.dm @@ -27,7 +27,7 @@ /datum/uplink_item/item/tools/firingpin //todo, make this a special syndicate one instead of just a normal one? name = "Firing Pin" bluecrystal_cost = 1 - path = /obj/item/device/firing_pin + path = /obj/item/firing_pin desc = "An unmarked firing pin - It should be compatible with nearly every weapon onboard." /datum/uplink_item/item/tools/surge @@ -59,14 +59,14 @@ name = "Encrypted Radio Channel Key" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/encryptionkey/syndicate + path = /obj/item/encryptionkey/syndicate desc = "An encryption key for use in a headset, intercepts all frequencies and grants access to a secure private frequency." /datum/uplink_item/item/tools/encryptionkey_binary name = "Binary Translator Key" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/encryptionkey/binary + path = /obj/item/encryptionkey/binary desc = "An encryption key for use in a headset, capable of intercepting stationbound binary communications." /datum/uplink_item/item/tools/emag @@ -82,13 +82,13 @@ This can only be bought once." telecrystal_cost = 1 item_limit = 1 - path = /obj/item/device/personal_shield + path = /obj/item/personal_shield /datum/uplink_item/item/tools/hacking_tool name = "Door Hacking Tool" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/multitool/hacktool + path = /obj/item/multitool/hacktool desc = "Appears and functions as a standard multitool until the mode is toggled by applying a screwdriver appropriately. \ When in hacking mode this device will grant full access to any standard airlock within 7 to 13 seconds. \ This device will also be able to immediately access the last 6 to 8 hacked airlocks." @@ -109,7 +109,7 @@ name = "Powersink (DANGER!)" telecrystal_cost = 6 bluecrystal_cost = 6 - path = /obj/item/device/powersink + path = /obj/item/powersink /datum/uplink_item/item/tools/ai_module name = "Hacked AI Upload Module" @@ -174,35 +174,35 @@ name = "Portable suit cooling unit" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/suit_cooling_unit + path = /obj/item/suit_cooling_unit desc = "A suit cooling unit with a high capacity power cell." /datum/uplink_item/item/tools/keypad name = "Keypad Mag-Lock" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/magnetic_lock/keypad + path = /obj/item/magnetic_lock/keypad desc = "A maglock that requires the user to enter a passcode to lock and then later unlock." /datum/uplink_item/item/tools/personal_ai name = "Personal AI" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/paicard + path = /obj/item/paicard desc = "An unmodified personal AI that can assist you in your ventures." /datum/uplink_item/item/tools/pin_extractor name = "Firing Pin Extractor" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/pin_extractor + path = /obj/item/pin_extractor desc = "An extractor tool capable of extracting firing pins from most firearms." /datum/uplink_item/item/tools/radio_jammer name = "Radio Jammer" telecrystal_cost = 2 bluecrystal_cost = 2 - path = /obj/item/device/radiojammer + path = /obj/item/radiojammer desc = "A small jammer that can fit inside a pocket. Capable of disrupting nearby radios and hivenet transmitters." /datum/uplink_item/item/tools/jetpack @@ -215,7 +215,7 @@ name = "Electropack" telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/radio/electropack + path = /obj/item/radio/electropack desc = "A backpack wired with electrodes. Sync up with a signaller, attach to an unwilling host and pulse the signal to shock them." /datum/uplink_item/item/tools/ammo_display @@ -243,7 +243,7 @@ desc = "This set of earmuffs has a secret compartment housing radio gear, allowing it to function as a standard headset." telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/radio/headset/earmuff + path = /obj/item/radio/headset/earmuff /datum/uplink_item/item/tools/liquidbags name = "25 Liquid-Bags" diff --git a/code/datums/uplink/exosuit.dm b/code/datums/uplink/exosuit.dm index 595d91d9311..097cbae9624 100644 --- a/code/datums/uplink/exosuit.dm +++ b/code/datums/uplink/exosuit.dm @@ -5,22 +5,22 @@ name = "Combat Exosuit Dropper" desc = "A device that can be used to drop in a combat exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 25 - path = /obj/item/device/orbital_dropper/mecha/combat + path = /obj/item/orbital_dropper/mecha/combat /datum/uplink_item/item/exosuit/heavy/New() name = "Heavy Exosuit Dropper" desc = "A device that can be used to drop in a heavy exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 20 - path = /obj/item/device/orbital_dropper/mecha/heavy + path = /obj/item/orbital_dropper/mecha/heavy /datum/uplink_item/item/exosuit/light/New() name = "Light Exosuit Dropper" desc = "A device that can be used to drop in a light exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 15 - path = /obj/item/device/orbital_dropper/mecha + path = /obj/item/orbital_dropper/mecha /datum/uplink_item/item/exosuit/powerloader/New() name = "Powerloader Exosuit Dropper" desc = "A device that can be used to drop in a powerloader exosuit. Can only be used outside [SSatlas.current_map.station_name] areas, unless emagged, which is hazardous." telecrystal_cost = 10 - path = /obj/item/device/orbital_dropper/mecha/powerloader + path = /obj/item/orbital_dropper/mecha/powerloader diff --git a/code/datums/uplink/implants.dm b/code/datums/uplink/implants.dm index 6965ba2f5c6..f4c5bab4bf4 100644 --- a/code/datums/uplink/implants.dm +++ b/code/datums/uplink/implants.dm @@ -41,25 +41,25 @@ name = "Combitool Augment Implanter" bluecrystal_cost = 1 desc = "An augment implanter, with the combitool augment." - path = /obj/item/device/augment_implanter/combitool + path = /obj/item/augment_implanter/combitool /datum/uplink_item/item/implants/aug_health_scanner name = "Health Scanner Augment Implanter" bluecrystal_cost = 1 desc = "An augment implanter, with the integrated health scanner augment." - path = /obj/item/device/augment_implanter/health_scanner + path = /obj/item/augment_implanter/health_scanner /datum/uplink_item/item/implants/hiveshield name = "Vaurca Hivenet Defense Implanter" bluecrystal_cost = 1 desc = "An augment implanter, with a Hivenet defense augment. ONLY WORKS ON VAURCA!" - path = /obj/item/device/augment_implanter/hivenet_shield + path = /obj/item/augment_implanter/hivenet_shield /datum/uplink_item/item/implants/hivewarfare name = "Vaurca Hivenet Warfare Suite" bluecrystal_cost = 5 desc = "A augment implanter, with a Hivenet defense augment and electronic warfare suite. ONLY WORKS ON VAURCA!" - path = /obj/item/device/augment_implanter/hivenet_warfare + path = /obj/item/augment_implanter/hivenet_warfare /datum/uplink_item/item/implants/telefreedom_kit name = "Telefreedom Kit" @@ -74,39 +74,39 @@ bluecrystal_cost = 3 telecrystal_cost = 3 desc = "An augment implanter, with a Auxiliary Heart bioaug. ONLY WORKS ON HUMANS!" - path = /obj/item/device/augment_implanter/auxiliary_heart + path = /obj/item/augment_implanter/auxiliary_heart /datum/uplink_item/item/implants/gravity_adaptations name = "Galatean Gravity Adaptations Implanter" bluecrystal_cost = 1 telecrystal_cost = 1 desc = "An augment implanter, with a Gravity Adaptations bioaug. ONLY WORKS ON OFF-WORLDERS!" - path = /obj/item/device/augment_implanter/gravity_adaptations + path = /obj/item/augment_implanter/gravity_adaptations /datum/uplink_item/item/implants/mind_blanker name = "Galatean Mind Blanker Implanter" bluecrystal_cost = 2 telecrystal_cost = 2 desc = "An augment implanter, with a Mind Blanker bioaug. ONLY WORKS ON HUMANS!" - path = /obj/item/device/augment_implanter/mind_blanker + path = /obj/item/augment_implanter/mind_blanker /datum/uplink_item/item/implants/mind_blanker_lethal name = "Galatean Mind Blanker (Lethal) Implanter" bluecrystal_cost = 4 telecrystal_cost = 4 desc = "An augment implanter, with a Lethal Mind Blanker bioaug. ONLY WORKS ON HUMANS!" - path = /obj/item/device/augment_implanter/mind_blanker_lethal + path = /obj/item/augment_implanter/mind_blanker_lethal /datum/uplink_item/item/implants/platelet_factories name = "Galatean Platelet Factories Implanter" bluecrystal_cost = 3 telecrystal_cost = 3 desc = "An augment implanter, with a Platelet Factories bioaug. ONLY WORKS ON HUMANS!" - path = /obj/item/device/augment_implanter/platelet_factories + path = /obj/item/augment_implanter/platelet_factories /datum/uplink_item/item/implants/subdermal_carapace name = "Galatean Subdermal Carapace Implanter" bluecrystal_cost = 5 telecrystal_cost = 5 desc = "An augment implanter, with a Subdermal Carapace bioaug. ONLY WORKS ON HUMANS!" - path = /obj/item/device/augment_implanter/subdermal_carapace + path = /obj/item/augment_implanter/subdermal_carapace diff --git a/code/datums/uplink/revolution.dm b/code/datums/uplink/revolution.dm index 7c3f49e5212..809e175265a 100644 --- a/code/datums/uplink/revolution.dm +++ b/code/datums/uplink/revolution.dm @@ -5,7 +5,7 @@ name = "Armory Dropper" desc = "A device that can be used to drop in an armory-worth of guns. Can only be used outside [SSatlas.current_map.station_short] areas, unless emagged, which is hazardous." telecrystal_cost = 25 - path = /obj/item/device/orbital_dropper/armory/syndicate + path = /obj/item/orbital_dropper/armory/syndicate /datum/uplink_item/item/revolution/implants name = "Box of Aggression Implants" diff --git a/code/datums/uplink/stealth and camouflage items.dm b/code/datums/uplink/stealth and camouflage items.dm index b15ee8da548..4543323c0bf 100644 --- a/code/datums/uplink/stealth and camouflage items.dm +++ b/code/datums/uplink/stealth and camouflage items.dm @@ -27,7 +27,7 @@ desc = "A small self-contained auto-surgery device that has the ability to conduct larynxial, facial and even melanin re-structuring surgery, in a (mostly) blood-less manner." telecrystal_cost = 1 bluecrystal_cost = 1 - path = /obj/item/device/cosmetic_surgery_kit + path = /obj/item/cosmetic_surgery_kit /datum/uplink_item/item/stealth_items/chameleon_kit name = "Chameleon Kit" @@ -52,7 +52,7 @@ name = "Chameleon-Projector" desc = "A device that can be used to mimic common items by scanning, then transforming into them." telecrystal_cost = 2 - path = /obj/item/device/chameleon + path = /obj/item/chameleon /datum/uplink_item/item/stealth_items/venenum name = "Vial of Venenum" diff --git a/code/datums/uplink/telecrystals.dm b/code/datums/uplink/telecrystals.dm index 88076aa810c..469b2ace2ac 100644 --- a/code/datums/uplink/telecrystals.dm +++ b/code/datums/uplink/telecrystals.dm @@ -5,7 +5,7 @@ category = /datum/uplink_category/crystals desc = "Acquire the uplink telecrystals in pure form." -/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/item/telecrystal/get_goods(var/obj/item/uplink/U, var/loc) return new /obj/item/stack/telecrystal(loc, telecrystal_cost(U.telecrystals)) /datum/uplink_item/item/telecrystal/one @@ -35,7 +35,7 @@ category = /datum/uplink_category/crystals desc = "Acquire the uplink bluecrystals in pure form." -/datum/uplink_item/item/bluecrystal/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/item/bluecrystal/get_goods(var/obj/item/uplink/U, var/loc) return new /obj/item/stack/telecrystal/blue(loc, bluecrystal_cost(U.bluecrystals)) /datum/uplink_item/item/bluecrystal/one diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm index edee2fcdbe8..104f161d933 100644 --- a/code/datums/uplink/uplink_categories.dm +++ b/code/datums/uplink/uplink_categories.dm @@ -8,7 +8,7 @@ ..() items = list() -/datum/uplink_category/proc/can_view(obj/item/device/uplink/U) +/datum/uplink_category/proc/can_view(obj/item/uplink/U) if(LAZYLEN(restricted_antags)) for(var/antag_role in restricted_antags) var/datum/antagonist/antag = GLOB.all_antag_types[antag_role] diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index 9fea6e936ca..0a16e186677 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -44,7 +44,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) /datum/uplink_item/item var/path -/datum/uplink_item/proc/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/proc/buy(var/obj/item/uplink/U, var/mob/user) var/extra_args = extra_args(user) if(!extra_args) return @@ -76,7 +76,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) if(istype(implanter)) var/obj/item/implant/uplink/uplink_implant = implanter.imp if(istype(uplink_implant)) - var/obj/item/device/uplink/hidden/hidden_uplink = uplink_implant.hidden_uplink + var/obj/item/uplink/hidden/hidden_uplink = uplink_implant.hidden_uplink if(istype(hidden_uplink)) hidden_uplink.purchase_log = U.purchase_log @@ -87,7 +87,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) /datum/uplink_item/proc/extra_args(var/mob/user) return 1 -/datum/uplink_item/proc/can_buy_telecrystals(obj/item/device/uplink/U) +/datum/uplink_item/proc/can_buy_telecrystals(obj/item/uplink/U) if(isnull(telecrystal_cost)) return FALSE @@ -99,7 +99,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) return can_view(U) -/datum/uplink_item/proc/can_buy_bluecrystals(obj/item/device/uplink/U) +/datum/uplink_item/proc/can_buy_bluecrystals(obj/item/uplink/U) if(isnull(bluecrystal_cost)) return FALSE @@ -111,10 +111,10 @@ GLOBAL_DATUM(uplink, /datum/uplink) return can_view(U) -/datum/uplink_item/proc/items_left(obj/item/device/uplink/U) +/datum/uplink_item/proc/items_left(obj/item/uplink/U) return item_limit - U.purchase_log[src] -/datum/uplink_item/proc/can_view(obj/item/device/uplink/U) +/datum/uplink_item/proc/can_view(obj/item/uplink/U) // Making the assumption that if no uplink was supplied, then we don't care about antag roles if(!U || (!length(antag_roles) && !antag_job)) return TRUE @@ -142,13 +142,13 @@ GLOBAL_DATUM(uplink, /datum/uplink) return desc // get_goods does not necessarily return physical objects, it is simply a way to acquire the uplink item without paying -/datum/uplink_item/proc/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/proc/get_goods(var/obj/item/uplink/U, var/loc) return FALSE /datum/uplink_item/proc/log_icon() return -/datum/uplink_item/proc/purchase_log(obj/item/device/uplink/U) +/datum/uplink_item/proc/purchase_log(obj/item/uplink/U) feedback_add_details("traitor_uplink_items_bought", "[src]") log_and_message_admins("used \the [U.loc] to buy \a [src]") U.purchase_log[src] = U.purchase_log[src] + 1 @@ -158,7 +158,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) * Physical Uplink Entries * * * ********************************/ -/datum/uplink_item/item/buy(var/obj/item/device/uplink/U, var/mob/user) +/datum/uplink_item/item/buy(var/obj/item/uplink/U, var/mob/user) var/obj/item/I = ..() if(!I) return @@ -172,7 +172,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) A.put_in_any_hand_if_possible(I) return I -/datum/uplink_item/item/get_goods(var/obj/item/device/uplink/U, var/loc) +/datum/uplink_item/item/get_goods(var/obj/item/uplink/U, var/loc) var/obj/I = new path(loc) return I @@ -204,7 +204,7 @@ GLOBAL_DATUM(uplink, /datum/uplink) /**************** * Support procs * ****************/ -/proc/get_random_uplink_items(var/obj/item/device/uplink/U, var/remaining_TC, var/loc) +/proc/get_random_uplink_items(var/obj/item/uplink/U, var/remaining_TC, var/loc) var/list/bought_items = list() while(remaining_TC) var/datum/uplink_item/I = GLOB.default_uplink_selection.get_random_item(remaining_TC, U, bought_items) diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 87169812c51..02c2284958d 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -1,6 +1,6 @@ /datum/wires/radio proper_name = "Radio" - holder_type = /obj/item/device/radio + holder_type = /obj/item/radio /datum/wires/radio/New() wires = list( @@ -14,13 +14,13 @@ /datum/wires/radio/interactable(mob/user) if(!..()) return FALSE - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder if(R.b_stat) return TRUE return FALSE /datum/wires/radio/on_pulse(wire) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder switch(wire) if(WIRE_SIGNAL) R.set_listening(!R.get_listening() && !is_cut(WIRE_RECEIVE)) @@ -34,7 +34,7 @@ SSnanoui.update_uis(holder) /datum/wires/radio/on_cut(wire, mend, source) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder switch(wire) if(WIRE_SIGNAL) R.set_listening(mend && !is_cut(WIRE_RECEIVE)) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 0333c0c8f7d..014f87b68ac 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(wire_name_directory, list()) holder = null //properly clear refs to avoid harddels & other problems for(var/color in assemblies) - var/obj/item/device/assembly/assembly = assemblies[color] + var/obj/item/assembly/assembly = assemblies[color] assembly.holder = null LAZYCLEARLIST(assemblies) return ..() @@ -171,13 +171,13 @@ GLOBAL_LIST_INIT(wire_name_directory, list()) /datum/wires/proc/pulse_color(color, mob/living/user, force=FALSE) pulse(get_wire(color), user, force) -/datum/wires/proc/pulse_assembly(obj/item/device/assembly/signaler/S) +/datum/wires/proc/pulse_assembly(obj/item/assembly/signaler/S) for(var/color in assemblies) if(S == assemblies[color]) pulse_color(color, force=TRUE) return TRUE -/datum/wires/proc/attach_assembly(color, obj/item/device/assembly/signaler/S) +/datum/wires/proc/attach_assembly(color, obj/item/assembly/signaler/S) if(S && istype(S) && !is_attached(color)) assemblies[color] = S S.forceMove(holder) @@ -185,7 +185,7 @@ GLOBAL_LIST_INIT(wire_name_directory, list()) return S /datum/wires/proc/detach_assembly(color) - var/obj/item/device/assembly/signaler/S = get_attached(color) + var/obj/item/assembly/signaler/S = get_attached(color) if(S && istype(S)) assemblies -= color S.connected = null @@ -318,7 +318,7 @@ GLOBAL_LIST_INIT(wire_name_directory, list()) if("attach") // Attach if(!is_attached(target_wire)) - var/obj/item/device/assembly/signaler/I = L.get_type_in_hands(/obj/item/device/assembly/signaler) + var/obj/item/assembly/signaler/I = L.get_type_in_hands(/obj/item/assembly/signaler) if(!istype(I)) to_chat(usr, SPAN_WARNING("You do not have a signaler to attach!")) return diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6fdcc6e5f2b..86375c01dce 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -382,7 +382,7 @@ var/uses = 4.0 var/selfdestruct = 0.0 var/traitor_frequency = 0.0 - var/obj/item/device/radio/origradio = null + var/obj/item/radio/origradio = null obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT throwforce = 5 @@ -472,9 +472,9 @@ icon_state = "power_mod" desc = "Charging circuits for power cells." -/obj/item/device/camera_bug +/obj/item/camera_bug name = "camera bug" - icon = 'icons/obj/item/device/flash.dmi' + icon = 'icons/obj/item/flash.dmi' icon_state = "flash" item_state = "flash" w_class = WEIGHT_CLASS_TINY @@ -522,7 +522,7 @@ /obj/item/neuralbroke/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) - new /obj/item/device/encryptionkey/hivenet(user.loc) + new /obj/item/encryptionkey/hivenet(user.loc) attacking_item.play_tool_sound(get_turf(src), 50) to_chat(user, "You bypass the fried security chip and extract the encryption key.") to_chat(user, "The fried neural socket crumbles away like dust.") diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm index 373f28ee7e5..a219139220f 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -42,21 +42,21 @@ return W /datum/antagonist/proc/create_radio(var/freq, var/mob/living/carbon/human/player) - var/obj/item/device/radio/R + var/obj/item/radio/R switch(freq) if(NINJ_FREQ) - R = new /obj/item/device/radio/headset/ninja(player) + R = new /obj/item/radio/headset/ninja(player) if(BLSP_FREQ) - R = new /obj/item/device/radio/headset/bluespace(player) + R = new /obj/item/radio/headset/bluespace(player) if(BURG_FREQ) - R = new /obj/item/device/radio/headset/burglar(player) + R = new /obj/item/radio/headset/burglar(player) if(SYND_FREQ) - R = new /obj/item/device/radio/headset/syndicate(player) + R = new /obj/item/radio/headset/syndicate(player) if(RAID_FREQ) - R = new /obj/item/device/radio/headset/raider(player) + R = new /obj/item/radio/headset/raider(player) else - R = new /obj/item/device/radio/headset(player) + R = new /obj/item/radio/headset(player) R.set_frequency(freq) R.set_frequency(freq) diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm index 9f5d66143a1..854b9a07801 100644 --- a/code/game/antagonist/antagonist_print.dm +++ b/code/game/antagonist/antagonist_print.dm @@ -94,7 +94,7 @@ var/bluecrystal_uses = 0 var/uplink_true = 0 var/purchases = "" - for(var/obj/item/device/uplink/H in GLOB.world_uplinks) + for(var/obj/item/uplink/H in GLOB.world_uplinks) if(H && H.uplink_owner && H.uplink_owner == ply) telecrystal_uses += H.used_telecrystals bluecrystal_uses += H.used_bluecrystals @@ -109,7 +109,7 @@ /proc/print_ownerless_uplinks() var/has_printed = 0 - for(var/obj/item/device/uplink/H in GLOB.world_uplinks) + for(var/obj/item/uplink/H in GLOB.world_uplinks) if(isnull(H.uplink_owner) && (H.used_telecrystals || H.used_bluecrystals)) if(!has_printed) has_printed = 1 @@ -117,7 +117,7 @@ to_world("[H.loc] (used [H.used_telecrystals] TC and [H.used_bluecrystals] BC)") to_world(get_uplink_purchases(H)) -/proc/get_uplink_purchases(var/obj/item/device/uplink/H) +/proc/get_uplink_purchases(var/obj/item/uplink/H) var/list/refined_log = new() for(var/datum/uplink_item/UI in H.purchase_log) refined_log.Add("[H.purchase_log[UI]]x[UI.log_icon()][UI.name]") diff --git a/code/game/antagonist/station/loyalist.dm b/code/game/antagonist/station/loyalist.dm index 5f6a41141cc..6e55cdddeb9 100644 --- a/code/game/antagonist/station/loyalist.dm +++ b/code/game/antagonist/station/loyalist.dm @@ -54,8 +54,8 @@ GLOBAL_DATUM(loyalists, /datum/antagonist/loyalists) if(!player.back) player.equip_to_slot_or_del(new /obj/item/storage/backpack(player), slot_back) // if they have no backpack, spawn one - player.equip_to_slot_or_del(new /obj/item/device/announcer(player), slot_in_backpack) - player.equip_to_slot_or_del(new /obj/item/device/special_uplink/rev(player, player.mind), slot_in_backpack) + player.equip_to_slot_or_del(new /obj/item/announcer(player), slot_in_backpack) + player.equip_to_slot_or_del(new /obj/item/special_uplink/rev(player, player.mind), slot_in_backpack) give_codewords(player) INVOKE_ASYNC(src, PROC_REF(alert_loyalist_status), player) diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index 5282ac0941b..ea4e41914da 100644 --- a/code/game/antagonist/station/revolutionary.dm +++ b/code/game/antagonist/station/revolutionary.dm @@ -65,8 +65,8 @@ GLOBAL_DATUM(revs, /datum/antagonist/revolutionary) if(!player.back) player.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(player), slot_back) // if they have no backpack, spawn one - player.equip_to_slot_or_del(new /obj/item/device/announcer(player), slot_in_backpack) - player.equip_to_slot_or_del(new /obj/item/device/special_uplink/rev(player, player.mind), slot_in_backpack) + player.equip_to_slot_or_del(new /obj/item/announcer(player), slot_in_backpack) + player.equip_to_slot_or_del(new /obj/item/special_uplink/rev(player, player.mind), slot_in_backpack) give_codewords(player) INVOKE_ASYNC(src, PROC_REF(alert_revolutionary_status), player) diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index 385d84142f0..7bd61293b42 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -121,7 +121,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) var/obj/item/R = locate() //Hide the uplink in a PDA if available, otherwise radio if(traitor_mob.client.prefs.uplinklocation == "Headset") - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents if(!R) R = locate(/obj/item/modular_computer/handheld) in traitor_mob.contents to_chat(traitor_mob, "Could not locate a Radio, installing in PDA instead!") @@ -130,7 +130,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) else if(traitor_mob.client.prefs.uplinklocation == "PDA") R = locate(/obj/item/modular_computer/handheld) in traitor_mob.contents if(!R) - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents to_chat(traitor_mob, "Could not locate a PDA, installing into a Radio instead!") if(!R) to_chat(traitor_mob, "Unfortunately, neither a radio or a PDA relay could be installed.") @@ -141,7 +141,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) to_chat(traitor_mob, "You have not selected a location for your relay in the antagonist options! Defaulting to PDA!") R = locate(/obj/item/modular_computer/handheld) in traitor_mob.contents if (!R) - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents to_chat(traitor_mob, "Could not locate a PDA, installing into a Radio instead!") if (!R) to_chat(traitor_mob, "Unfortunately, neither a radio or a PDA relay could be installed.") @@ -149,9 +149,9 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) if(!R) return - if(istype(R,/obj/item/device/radio)) + if(istype(R,/obj/item/radio)) // generate list of radio freqs - var/obj/item/device/radio/target_radio = R + var/obj/item/radio/target_radio = R var/freq = PUBLIC_LOW_FREQ var/list/freqlist = list() while (freq <= PUBLIC_HIGH_FREQ) @@ -161,7 +161,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) if ((freq % 2) == 0) freq += 1 freq = freqlist[rand(1, freqlist.len)] - var/obj/item/device/uplink/hidden/T = new(R, traitor_mob.mind) + var/obj/item/uplink/hidden/T = new(R, traitor_mob.mind) target_radio.hidden_uplink = T target_radio.traitor_frequency = freq to_chat(traitor_mob, "A portable object teleportation relay has been installed in your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.") @@ -170,7 +170,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor) else if (istype(R, /obj/item/modular_computer)) // generate a passcode if the uplink is hidden in a PDA var/pda_pass = "[rand(100,999)] [pick("Alpha","Bravo","Delta","Omega")]" - var/obj/item/device/uplink/hidden/T = new(R, traitor_mob.mind) + var/obj/item/uplink/hidden/T = new(R, traitor_mob.mind) R.hidden_uplink = T T.pda_code = pda_pass to_chat(traitor_mob, "A portable object teleportation relay has been installed in your [R.name] [loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") diff --git a/code/game/gamemodes/cult/cultify/obj.dm b/code/game/gamemodes/cult/cultify/obj.dm index 0312f4e268f..b8ad55c56a8 100644 --- a/code/game/gamemodes/cult/cultify/obj.dm +++ b/code/game/gamemodes/cult/cultify/obj.dm @@ -12,7 +12,7 @@ /obj/effect/overlay/cultify() return -/obj/item/device/flashlight/lamp/cultify() +/obj/item/flashlight/lamp/cultify() new /obj/structure/cult/pylon(get_turf(src)) qdel(src) return "As you cast \the [src] into the forge, a great pylon grows beneath your feet, achieving its form in seconds." diff --git a/code/game/gamemodes/cult/items/armor.dm b/code/game/gamemodes/cult/items/armor.dm index 0fc1a950b27..8243070044f 100644 --- a/code/game/gamemodes/cult/items/armor.dm +++ b/code/game/gamemodes/cult/items/armor.dm @@ -40,7 +40,7 @@ item_state = "cult_armor" desc = "A bulky armored voidsuit, bristling with menacing spikes. It looks space proof." w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/book/tome, /obj/item/melee/cultblade, /obj/item/gun/energy/rifle/cult, /obj/item/tank, /obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/book/tome, /obj/item/melee/cultblade, /obj/item/gun/energy/rifle/cult, /obj/item/tank, /obj/item/suit_cooling_unit) slowdown = 1 armor = list( MELEE = ARMOR_MELEE_VERY_HIGH, diff --git a/code/game/gamemodes/cult/runes/convert.dm b/code/game/gamemodes/cult/runes/convert.dm index e73cda06774..1c35a092d0d 100644 --- a/code/game/gamemodes/cult/runes/convert.dm +++ b/code/game/gamemodes/cult/runes/convert.dm @@ -101,7 +101,7 @@ /datum/rune/convert/proc/shard_player(var/mob/living/target, atom/movable/A) converting -= target - var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(A)) + var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(A)) target.death() stone.transfer_human(target) var/mob/living/simple_animal/shade/shade = locate() in stone diff --git a/code/game/gamemodes/cult/runes/sacrifice.dm b/code/game/gamemodes/cult/runes/sacrifice.dm index 6df1c7fd17b..0f24f23fe65 100644 --- a/code/game/gamemodes/cult/runes/sacrifice.dm +++ b/code/game/gamemodes/cult/runes/sacrifice.dm @@ -16,8 +16,8 @@ var/obj/item/organ/internal/brain/B = I victims += B.brainmob - else if(istype(I,/obj/item/device/mmi)) - var/obj/item/device/mmi/B = I + else if(istype(I,/obj/item/mmi)) + var/obj/item/mmi/B = I victims += B.brainmob else if(istype(I,/obj/item/aicard)) diff --git a/code/game/gamemodes/cult/runes/summon_soulstone.dm b/code/game/gamemodes/cult/runes/summon_soulstone.dm index f2a8ae1d0b4..a1ece22e0c0 100644 --- a/code/game/gamemodes/cult/runes/summon_soulstone.dm +++ b/code/game/gamemodes/cult/runes/summon_soulstone.dm @@ -4,6 +4,6 @@ /datum/rune/summon_soulstone/do_rune_action(mob/living/user, atom/movable/A) user.say("N'ath reth sh'yro eth d'raggathnor!") - new /obj/item/device/soulstone(get_turf(A)) + new /obj/item/soulstone(get_turf(A)) qdel(A) return TRUE diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm index 3ecf7151401..6994faddc47 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HARDWARE.dm @@ -73,7 +73,7 @@ to_chat(user, SPAN_WARNING("You are dead!")) return - var/obj/item/device/radio/radio = new/obj/item/device/radio() + var/obj/item/radio/radio = new/obj/item/radio() var/datum/weakref/nuke //Time control for the self destruct //It works in 3 stages: diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index 5643f1169c8..4c889f737b9 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -222,9 +222,9 @@ name = "Spyglass" desc = "A mundane spyglass, it may prove useful to those who wish to scout ahead, or fight from an extreme range." cost = 100 - obj_path = /obj/item/device/binoculars/spyglass + obj_path = /obj/item/binoculars/spyglass -/obj/item/device/binoculars/spyglass +/obj/item/binoculars/spyglass name = "spyglass" desc = "It's a hand-held telescope, useful for star-gazing, peeping, and recon." icon_state = "spyglass" diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 674b2948e74..f7b3cb9bc51 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -155,7 +155,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/heph backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1, /obj/item/stamp/hephaestus = 1 ) diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index faa1a68b57a..b0e4c9f5d10 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -195,7 +195,7 @@ name = "Curator - Idris" jobtype = /datum/job/librarian - r_pocket = /obj/item/device/price_scanner + r_pocket = /obj/item/price_scanner l_hand = null /obj/outfit/job/librarian/idris/tech_support @@ -205,7 +205,7 @@ l_pocket = /obj/item/modular_computer/handheld/preset/generic r_pocket = /obj/item/card/tech_support r_hand = /obj/item/storage/bag/circuits/basic - l_hand = /obj/item/device/debugger + l_hand = /obj/item/debugger wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian /obj/outfit/job/chaplain/idris @@ -245,7 +245,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/idris backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1, /obj/item/stamp/idris = 1 ) diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index bf64a623fa8..722c9f6d907 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -185,7 +185,7 @@ name = "Curator - Orion Express" jobtype = /datum/job/librarian - r_pocket = /obj/item/device/price_scanner + r_pocket = /obj/item/price_scanner l_hand = null /obj/outfit/job/librarian/orion/tech_support @@ -195,7 +195,7 @@ l_pocket = /obj/item/modular_computer/handheld/preset/generic r_pocket = /obj/item/card/tech_support r_hand = /obj/item/storage/bag/circuits/basic - l_hand = /obj/item/device/debugger + l_hand = /obj/item/debugger wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian /obj/outfit/job/journalist/orion diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 52c8aa4eabe..85f3904f528 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -271,7 +271,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/zavod backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/projectile/pistol = 1, /obj/item/stamp/zavodskoi = 1 ) diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index c527ac2bd0e..e99896a950b 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -240,7 +240,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/zeng backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1, /obj/item/stamp/zeng_hu = 1 ) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b190e1caab1..b2bbbf91774 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -36,11 +36,11 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca glasses = /obj/item/clothing/glasses/sunglasses id = /obj/item/card/id/scc/gold/captain - headset = /obj/item/device/radio/headset/heads/captain - bowman = /obj/item/device/radio/headset/heads/captain/alt - double_headset = /obj/item/device/radio/headset/alt/double/captain - wrist_radio = /obj/item/device/radio/headset/wrist/captain - clipon_radio = /obj/item/device/radio/headset/wrist/clip/captain + headset = /obj/item/radio/headset/heads/captain + bowman = /obj/item/radio/headset/heads/captain/alt + double_headset = /obj/item/radio/headset/alt/double/captain + wrist_radio = /obj/item/radio/headset/wrist/captain + clipon_radio = /obj/item/radio/headset/wrist/clip/captain tab_pda = /obj/item/modular_computer/handheld/pda/command/captain wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/captain @@ -123,11 +123,11 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca shoes = /obj/item/clothing/shoes/laceup/brown id = /obj/item/card/id/scc/silver - headset = /obj/item/device/radio/headset/heads/xo - bowman = /obj/item/device/radio/headset/heads/xo/alt - double_headset = /obj/item/device/radio/headset/alt/double/xo - wrist_radio = /obj/item/device/radio/headset/wrist/xo - clipon_radio = /obj/item/device/radio/headset/wrist/clip/xo + headset = /obj/item/radio/headset/heads/xo + bowman = /obj/item/radio/headset/heads/xo/alt + double_headset = /obj/item/radio/headset/alt/double/xo + wrist_radio = /obj/item/radio/headset/wrist/xo + clipon_radio = /obj/item/radio/headset/wrist/clip/xo tab_pda = /obj/item/modular_computer/handheld/pda/command/xo wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/xo @@ -181,11 +181,11 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca shoes = /obj/item/clothing/shoes/laceup id = /obj/item/card/id/scc/bridge - headset = /obj/item/device/radio/headset/headset_com - bowman = /obj/item/device/radio/headset/headset_com/alt - double_headset = /obj/item/device/radio/headset/alt/double/command - wrist_radio = /obj/item/device/radio/headset/wrist/command - clipon_radio = /obj/item/device/radio/headset/wrist/clip/command + headset = /obj/item/radio/headset/headset_com + bowman = /obj/item/radio/headset/headset_com/alt + double_headset = /obj/item/radio/headset/alt/double/command + wrist_radio = /obj/item/radio/headset/wrist/command + clipon_radio = /obj/item/radio/headset/wrist/clip/command messengerbag = /obj/item/storage/backpack/messenger/com tab_pda = /obj/item/modular_computer/handheld/pda/bridge diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 35879ff214e..ad0e8cfd34e 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -34,11 +34,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/bartender tablet = /obj/item/modular_computer/handheld/preset/civilian/bartender - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service backpack_faction = /obj/item/storage/backpack/nt satchel_faction = /obj/item/storage/backpack/satchel/nt @@ -81,11 +81,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service backpack_faction = /obj/item/storage/backpack/nt satchel_faction = /obj/item/storage/backpack/satchel/nt @@ -132,11 +132,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service backpack = /obj/item/storage/backpack/hydroponics backpack_faction = /obj/item/storage/backpack/nt @@ -184,11 +184,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/janitor tablet = /obj/item/modular_computer/handheld/preset/civilian/janitor - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service backpack_faction = /obj/item/storage/backpack/nt satchel_faction = /obj/item/storage/backpack/satchel/nt @@ -227,11 +227,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service backpack_faction = /obj/item/storage/backpack/nt satchel_faction = /obj/item/storage/backpack/satchel/nt @@ -243,7 +243,7 @@ jobtype = /datum/job/librarian uniform = /obj/item/clothing/under/suit_jacket - r_pocket = /obj/item/device/price_scanner + r_pocket = /obj/item/price_scanner l_hand = null /obj/outfit/job/librarian/tech_support @@ -254,7 +254,7 @@ l_pocket = /obj/item/modular_computer/handheld/preset/generic r_pocket = /obj/item/card/tech_support r_hand = /obj/item/storage/bag/circuits/basic - l_hand = /obj/item/device/debugger + l_hand = /obj/item/debugger wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian /obj/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -287,11 +287,11 @@ uniform = /obj/item/clothing/under/rank/chaplain shoes = /obj/item/clothing/shoes/sneakers/black - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service tab_pda = /obj/item/modular_computer/handheld/pda/civilian/chaplain wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/chaplain @@ -311,7 +311,7 @@ var/datum/religion/religion = SSrecords.religions[H.religion] if (religion) if(religion.unique_book_path) - var/obj/item/device/versebook/U = new religion.unique_book_path(get_turf(H)) + var/obj/item/versebook/U = new religion.unique_book_path(get_turf(H)) var/obj/item/storage/S = locate() in H.contents if(S && istype(S)) U.forceMove(S) @@ -375,11 +375,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/om tablet = /obj/item/modular_computer/handheld/preset/supply/om - headset = /obj/item/device/radio/headset/operations_manager - bowman = /obj/item/device/radio/headset/operations_manager/alt - double_headset = /obj/item/device/radio/headset/alt/double/operations_manager - wrist_radio = /obj/item/device/radio/headset/wrist/cargo/operations_manager - clipon_radio = /obj/item/device/radio/headset/wrist/clip/cargo/operations_manager + headset = /obj/item/radio/headset/operations_manager + bowman = /obj/item/radio/headset/operations_manager/alt + double_headset = /obj/item/radio/headset/alt/double/operations_manager + wrist_radio = /obj/item/radio/headset/wrist/cargo/operations_manager + clipon_radio = /obj/item/radio/headset/wrist/clip/cargo/operations_manager backpack = /obj/item/storage/backpack/om satchel = /obj/item/storage/backpack/satchel/om @@ -426,11 +426,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply tablet = /obj/item/modular_computer/handheld/preset/supply - headset = /obj/item/device/radio/headset/headset_cargo - bowman = /obj/item/device/radio/headset/headset_cargo/alt - double_headset = /obj/item/device/radio/headset/alt/double/cargo - wrist_radio = /obj/item/device/radio/headset/wrist/cargo - clipon_radio = /obj/item/device/radio/headset/wrist/clip/cargo + headset = /obj/item/radio/headset/headset_cargo + bowman = /obj/item/radio/headset/headset_cargo/alt + double_headset = /obj/item/radio/headset/alt/double/cargo + wrist_radio = /obj/item/radio/headset/wrist/cargo + clipon_radio = /obj/item/radio/headset/wrist/clip/cargo /datum/job/mining title = "Shaft Miner" @@ -473,11 +473,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/miner tablet = /obj/item/modular_computer/handheld/preset/civilian - headset = /obj/item/device/radio/headset/headset_mining - bowman = /obj/item/device/radio/headset/headset_mining/alt - double_headset = /obj/item/device/radio/headset/alt/double/mining - wrist_radio = /obj/item/device/radio/headset/wrist/cargo/mining - clipon_radio = /obj/item/device/radio/headset/wrist/clip/cargo/mining + headset = /obj/item/radio/headset/headset_mining + bowman = /obj/item/radio/headset/headset_mining/alt + double_headset = /obj/item/radio/headset/alt/double/mining + wrist_radio = /obj/item/radio/headset/wrist/cargo/mining + clipon_radio = /obj/item/radio/headset/wrist/clip/cargo/mining backpack_contents = list( /obj/item/storage/bag/ore = 1 @@ -534,11 +534,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/machinist tablet = /obj/item/modular_computer/handheld/preset/supply/machinist - headset = /obj/item/device/radio/headset/headset_cargo - bowman = /obj/item/device/radio/headset/headset_cargo/alt - double_headset = /obj/item/device/radio/headset/alt/double/cargo - wrist_radio = /obj/item/device/radio/headset/wrist/cargo - clipon_radio = /obj/item/device/radio/headset/wrist/clip/cargo + headset = /obj/item/radio/headset/headset_cargo + bowman = /obj/item/radio/headset/headset_cargo/alt + double_headset = /obj/item/radio/headset/alt/double/cargo + wrist_radio = /obj/item/radio/headset/wrist/cargo + clipon_radio = /obj/item/radio/headset/wrist/clip/cargo belt_contents = list( /obj/item/screwdriver = 1, diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d96c83362e0..d1571a163c4 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -46,13 +46,13 @@ belt = /obj/item/storage/belt/utility/ce id = /obj/item/card/id/scc/silver shoes = null - r_pocket = /obj/item/device/t_scanner + r_pocket = /obj/item/t_scanner - headset = /obj/item/device/radio/headset/heads/ce - bowman = /obj/item/device/radio/headset/heads/ce/alt - double_headset = /obj/item/device/radio/headset/alt/double/ce - wrist_radio = /obj/item/device/radio/headset/wrist/ce - clipon_radio = /obj/item/device/radio/headset/wrist/clip/ce + headset = /obj/item/radio/headset/heads/ce + bowman = /obj/item/radio/headset/heads/ce/alt + double_headset = /obj/item/radio/headset/alt/double/ce + wrist_radio = /obj/item/radio/headset/wrist/ce + clipon_radio = /obj/item/radio/headset/wrist/clip/ce tab_pda = /obj/item/modular_computer/handheld/pda/engineering/ce wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering/ce @@ -113,13 +113,13 @@ belt = /obj/item/storage/belt/utility id = /obj/item/card/id/silver shoes = null - r_pocket = /obj/item/device/t_scanner + r_pocket = /obj/item/t_scanner - headset = /obj/item/device/radio/headset/headset_eng - bowman = /obj/item/device/radio/headset/headset_eng/alt - double_headset = /obj/item/device/radio/headset/alt/double/eng - wrist_radio = /obj/item/device/radio/headset/wrist/eng - clipon_radio = /obj/item/device/radio/headset/wrist/clip/eng + headset = /obj/item/radio/headset/headset_eng + bowman = /obj/item/radio/headset/headset_eng/alt + double_headset = /obj/item/radio/headset/alt/double/eng + wrist_radio = /obj/item/radio/headset/wrist/eng + clipon_radio = /obj/item/radio/headset/wrist/clip/eng tab_pda = /obj/item/modular_computer/handheld/pda/engineering wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering @@ -186,11 +186,11 @@ id = /obj/item/card/id/silver shoes = null - headset = /obj/item/device/radio/headset/headset_eng - bowman = /obj/item/device/radio/headset/headset_eng/alt - double_headset = /obj/item/device/radio/headset/alt/double/eng - wrist_radio = /obj/item/device/radio/headset/wrist/eng - clipon_radio = /obj/item/device/radio/headset/wrist/clip/eng + headset = /obj/item/radio/headset/headset_eng + bowman = /obj/item/radio/headset/headset_eng/alt + double_headset = /obj/item/radio/headset/alt/double/eng + wrist_radio = /obj/item/radio/headset/wrist/eng + clipon_radio = /obj/item/radio/headset/wrist/clip/eng backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng @@ -207,8 +207,8 @@ /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, - /obj/item/device/t_scanner = 1, - /obj/item/device/analyzer = 1, + /obj/item/t_scanner = 1, + /obj/item/analyzer = 1, /obj/item/pipewrench = 1 ) @@ -268,11 +268,11 @@ /obj/item/stack/cable_coil/random = 1 ) - headset = /obj/item/device/radio/headset/headset_eng - bowman = /obj/item/device/radio/headset/headset_eng/alt - double_headset = /obj/item/device/radio/headset/alt/double/eng - wrist_radio = /obj/item/device/radio/headset/wrist/eng - clipon_radio = /obj/item/device/radio/headset/wrist/clip/eng + headset = /obj/item/radio/headset/headset_eng + bowman = /obj/item/radio/headset/headset_eng/alt + double_headset = /obj/item/radio/headset/alt/double/eng + wrist_radio = /obj/item/radio/headset/wrist/eng + clipon_radio = /obj/item/radio/headset/wrist/clip/eng backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng @@ -299,16 +299,16 @@ /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, - /obj/item/device/t_scanner = 1, - /obj/item/device/analyzer = 1, + /obj/item/t_scanner = 1, + /obj/item/analyzer = 1, /obj/item/pipewrench = 1 ) - headset = /obj/item/device/radio/headset/headset_eng - bowman = /obj/item/device/radio/headset/headset_eng/alt - double_headset = /obj/item/device/radio/headset/alt/double/eng - wrist_radio = /obj/item/device/radio/headset/wrist/eng - clipon_radio = /obj/item/device/radio/headset/wrist/clip/eng + headset = /obj/item/radio/headset/headset_eng + bowman = /obj/item/radio/headset/headset_eng/alt + double_headset = /obj/item/radio/headset/alt/double/eng + wrist_radio = /obj/item/radio/headset/wrist/eng + clipon_radio = /obj/item/radio/headset/wrist/clip/eng backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index fd4e2d6859b..e8c7aec4091 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -69,11 +69,11 @@ belt = /obj/item/storage/belt/medical/paramedic belt_contents = list( /obj/item/reagent_containers/hypospray = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex/nitrile - r_ear = /obj/item/device/flashlight/pen + r_ear = /obj/item/flashlight/pen species_gloves = list( SPECIES_UNATHI = /obj/item/clothing/gloves/latex/nitrile/unathi, SPECIES_TAJARA = /obj/item/clothing/gloves/latex/nitrile/tajara, @@ -129,7 +129,7 @@ /obj/item/crowbar = 1, /obj/item/wirecutters = 1, /obj/item/stack/cable_coil/random = 1, - /obj/item/device/multitool = 1, + /obj/item/multitool = 1, /obj/item/hammer = 1 ) @@ -162,9 +162,9 @@ name = "Research Personnel" backpack_contents = list( /obj/item/storage/box/survival = 1, - /obj/item/device/camera = 1, - /obj/item/device/camera_film = 2, - /obj/item/device/taperecorder = 1 + /obj/item/camera = 1, + /obj/item/camera_film = 2, + /obj/item/taperecorder = 1 ) belt = /obj/item/storage/belt/archaeology/full diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index c15215df754..4de90bf0f43 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -47,17 +47,17 @@ head = /obj/item/clothing/head/beret/scc/alt belt = /obj/item/melee/telebaton - headset = /obj/item/device/radio/headset/representative - bowman = /obj/item/device/radio/headset/representative/alt - double_headset = /obj/item/device/radio/headset/alt/double/command/representative - wrist_radio = /obj/item/device/radio/headset/wrist/command/representative + headset = /obj/item/radio/headset/representative + bowman = /obj/item/radio/headset/representative/alt + double_headset = /obj/item/radio/headset/alt/double/command/representative + wrist_radio = /obj/item/radio/headset/wrist/command/representative tab_pda = /obj/item/modular_computer/handheld/pda/civilian/lawyer wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/lawyer tablet = /obj/item/modular_computer/handheld/preset/civilian/lawyer l_pocket = /obj/item/reagent_containers/spray/pepper - r_pocket = /obj/item/device/taperecorder/cciaa + r_pocket = /obj/item/taperecorder/cciaa l_hand = /obj/item/storage/lockbox/cciaa id = /obj/item/card/id/scc/gold diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 558d7b78294..7ed1fdd7d49 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -353,11 +353,11 @@ back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/sneakers/black - headset = /obj/item/device/radio/headset - bowman = /obj/item/device/radio/headset/alt - double_headset = /obj/item/device/radio/headset/alt/double - wrist_radio = /obj/item/device/radio/headset/wrist - clipon_radio = /obj/item/device/radio/headset/wrist/clip + headset = /obj/item/radio/headset + bowman = /obj/item/radio/headset/alt + double_headset = /obj/item/radio/headset/alt/double + wrist_radio = /obj/item/radio/headset/wrist + clipon_radio = /obj/item/radio/headset/wrist/clip tab_pda = /obj/item/modular_computer/handheld/pda/civilian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 01e262ece26..aae6d23be0b 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -41,16 +41,16 @@ uniform = /obj/item/clothing/under/rank/chief_medical_officer suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo - suit_store = /obj/item/device/flashlight/pen + suit_store = /obj/item/flashlight/pen shoes = /obj/item/clothing/shoes/sneakers/brown id = /obj/item/card/id/scc/silver l_hand = /obj/item/storage/firstaid/adv - headset = /obj/item/device/radio/headset/heads/cmo - bowman = /obj/item/device/radio/headset/heads/cmo/alt - double_headset = /obj/item/device/radio/headset/alt/double/cmo - wrist_radio = /obj/item/device/radio/headset/wrist/cmo - clipon_radio = /obj/item/device/radio/headset/wrist/clip/cmo + headset = /obj/item/radio/headset/heads/cmo + bowman = /obj/item/radio/headset/heads/cmo/alt + double_headset = /obj/item/radio/headset/alt/double/cmo + wrist_radio = /obj/item/radio/headset/wrist/cmo + clipon_radio = /obj/item/radio/headset/wrist/clip/cmo tab_pda = /obj/item/modular_computer/handheld/pda/medical/cmo wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/cmo @@ -117,13 +117,13 @@ suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt shoes = /obj/item/clothing/shoes/sneakers/medsci id = /obj/item/card/id/white - suit_store = /obj/item/device/flashlight/pen + suit_store = /obj/item/flashlight/pen - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt - double_headset = /obj/item/device/radio/headset/alt/double/med - wrist_radio = /obj/item/device/radio/headset/wrist/med - clipon_radio = /obj/item/device/radio/headset/wrist/clip/med + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt + double_headset = /obj/item/radio/headset/alt/double/med + wrist_radio = /obj/item/radio/headset/wrist/med + clipon_radio = /obj/item/radio/headset/wrist/clip/med tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical @@ -182,11 +182,11 @@ shoes = /obj/item/clothing/shoes/sneakers/medsci id = /obj/item/card/id/white - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt - double_headset = /obj/item/device/radio/headset/alt/double/med - wrist_radio = /obj/item/device/radio/headset/wrist/med - clipon_radio = /obj/item/device/radio/headset/wrist/clip/med + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt + double_headset = /obj/item/radio/headset/alt/double/med + wrist_radio = /obj/item/radio/headset/wrist/med + clipon_radio = /obj/item/radio/headset/wrist/clip/med tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical @@ -236,11 +236,11 @@ shoes = /obj/item/clothing/shoes/sneakers/medsci id = /obj/item/card/id/white - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt - double_headset = /obj/item/device/radio/headset/alt/double/med - wrist_radio = /obj/item/device/radio/headset/wrist/med - clipon_radio = /obj/item/device/radio/headset/wrist/clip/med + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt + double_headset = /obj/item/radio/headset/alt/double/med + wrist_radio = /obj/item/radio/headset/wrist/med + clipon_radio = /obj/item/radio/headset/wrist/clip/med tab_pda = /obj/item/modular_computer/handheld/pda/medical/psych wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/psych @@ -294,11 +294,11 @@ shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/white - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt - double_headset = /obj/item/device/radio/headset/alt/double/med - wrist_radio = /obj/item/device/radio/headset/wrist/med - clipon_radio = /obj/item/device/radio/headset/wrist/clip/med + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt + double_headset = /obj/item/radio/headset/alt/double/med + wrist_radio = /obj/item/radio/headset/wrist/med + clipon_radio = /obj/item/radio/headset/wrist/clip/med tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical @@ -365,11 +365,11 @@ uniform = /obj/item/clothing/under/rank/medical/intern shoes = /obj/item/clothing/shoes/sneakers/medsci - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt - double_headset = /obj/item/device/radio/headset/alt/double/med - wrist_radio = /obj/item/device/radio/headset/wrist/med - clipon_radio = /obj/item/device/radio/headset/wrist/clip/med + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt + double_headset = /obj/item/radio/headset/alt/double/med + wrist_radio = /obj/item/radio/headset/wrist/med + clipon_radio = /obj/item/radio/headset/wrist/clip/med backpack = /obj/item/storage/backpack/medic backpack_faction = /obj/item/storage/backpack/nt diff --git a/code/game/jobs/job/outsider/merchant.dm b/code/game/jobs/job/outsider/merchant.dm index 9b57ca35e9f..4bd82d1fb11 100644 --- a/code/game/jobs/job/outsider/merchant.dm +++ b/code/game/jobs/job/outsider/merchant.dm @@ -44,7 +44,7 @@ tab_pda = /obj/item/modular_computer/handheld/pda/civilian/merchant wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian - r_pocket = /obj/item/device/price_scanner + r_pocket = /obj/item/price_scanner /obj/outfit/merchant_assistant name = "Merchant's Assistant" @@ -52,7 +52,7 @@ tab_pda = /obj/item/modular_computer/handheld/pda/civilian/merchant wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian - r_pocket = /obj/item/device/price_scanner + r_pocket = /obj/item/price_scanner belt = /obj/item/storage/belt/utility/full uniform = list( /obj/item/clothing/under/suit_jacket/charcoal, diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index 9920382cbfa..818e75ab14a 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -38,11 +38,11 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service backpack_faction = /obj/item/storage/backpack/nt satchel_faction = /obj/item/storage/backpack/satchel/nt @@ -51,7 +51,7 @@ backpack_contents = list( /obj/item/clothing/accessory/badge/press = 1, - /obj/item/device/tvcamera = 1 + /obj/item/tvcamera = 1 ) /obj/outfit/job/journalistf @@ -67,7 +67,7 @@ backpack_contents = list( /obj/item/clothing/accessory/badge/press/independent = 1, - /obj/item/device/tvcamera = 1 + /obj/item/tvcamera = 1 ) /datum/job/representative @@ -143,16 +143,16 @@ tablet = /obj/item/modular_computer/handheld/preset/civilian/lawyer shoes = /obj/item/clothing/shoes/laceup glasses = /obj/item/clothing/glasses/sunglasses/big - headset = /obj/item/device/radio/headset/representative - bowman = /obj/item/device/radio/headset/representative/alt - double_headset = /obj/item/device/radio/headset/alt/double/command/representative - wrist_radio = /obj/item/device/radio/headset/wrist/command/representative - clipon_radio = /obj/item/device/radio/headset/wrist/clip/command/representative + headset = /obj/item/radio/headset/representative + bowman = /obj/item/radio/headset/representative/alt + double_headset = /obj/item/radio/headset/alt/double/command/representative + wrist_radio = /obj/item/radio/headset/wrist/command/representative + clipon_radio = /obj/item/radio/headset/wrist/clip/command/representative accessory = /obj/item/clothing/accessory/tie/corporate suit_accessory = /obj/item/clothing/accessory/pin/corporate backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1 ) @@ -234,7 +234,7 @@ head = null suit = null backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1 ) implants = null @@ -338,11 +338,11 @@ tablet = /obj/item/modular_computer/handheld/preset/civilian/lawyer shoes = /obj/item/clothing/shoes/laceup glasses = /obj/item/clothing/glasses/sunglasses/big - headset = /obj/item/device/radio/headset/representative - bowman = /obj/item/device/radio/headset/representative/alt - double_headset = /obj/item/device/radio/headset/alt/double/command/representative - wrist_radio = /obj/item/device/radio/headset/wrist/command/representative - clipon_radio = /obj/item/device/radio/headset/wrist/clip/command/representative + headset = /obj/item/radio/headset/representative + bowman = /obj/item/radio/headset/representative/alt + double_headset = /obj/item/radio/headset/alt/double/command/representative + wrist_radio = /obj/item/radio/headset/wrist/command/representative + clipon_radio = /obj/item/radio/headset/wrist/clip/command/representative /datum/job/diplomatic_aide/after_spawn(mob/living/carbon/human/H) LAZYDISTINCTADD(blacklisted_citizenship, H.citizenship) @@ -385,11 +385,11 @@ tablet = /obj/item/modular_computer/handheld/preset/civilian/lawyer shoes = /obj/item/clothing/shoes/laceup glasses = /obj/item/clothing/glasses/sunglasses/big - headset = /obj/item/device/radio/headset/representative - bowman = /obj/item/device/radio/headset/representative/alt - double_headset = /obj/item/device/radio/headset/alt/double/command/representative - wrist_radio = /obj/item/device/radio/headset/wrist/command/representative - clipon_radio = /obj/item/device/radio/headset/wrist/clip/command/representative + headset = /obj/item/radio/headset/representative + bowman = /obj/item/radio/headset/representative/alt + double_headset = /obj/item/radio/headset/alt/double/command/representative + wrist_radio = /obj/item/radio/headset/wrist/command/representative + clipon_radio = /obj/item/radio/headset/wrist/clip/command/representative /datum/job/diplomatic_bodyguard/after_spawn(mob/living/carbon/human/H) LAZYDISTINCTADD(blacklisted_citizenship, H.citizenship) @@ -429,8 +429,8 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/lawyer tablet = /obj/item/modular_computer/handheld/preset/civilian/lawyer shoes = /obj/item/clothing/shoes/laceup - headset = /obj/item/device/radio/headset/representative - bowman = /obj/item/device/radio/headset/representative/alt - double_headset = /obj/item/device/radio/headset/alt/double/command/representative - wrist_radio = /obj/item/device/radio/headset/wrist/command/representative - clipon_radio = /obj/item/device/radio/headset/wrist/clip/command/representative + headset = /obj/item/radio/headset/representative + bowman = /obj/item/radio/headset/representative/alt + double_headset = /obj/item/radio/headset/alt/double/command/representative + wrist_radio = /obj/item/radio/headset/wrist/command/representative + clipon_radio = /obj/item/radio/headset/wrist/clip/command/representative diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index f822eac3a84..8e7cab4944e 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -44,11 +44,11 @@ id = /obj/item/card/id/scc/silver l_hand = /obj/item/clipboard - headset = /obj/item/device/radio/headset/heads/rd - bowman = /obj/item/device/radio/headset/heads/rd/alt - double_headset = /obj/item/device/radio/headset/alt/double/rd - wrist_radio = /obj/item/device/radio/headset/wrist/rd - clipon_radio = /obj/item/device/radio/headset/wrist/clip/rd + headset = /obj/item/radio/headset/heads/rd + bowman = /obj/item/radio/headset/heads/rd/alt + double_headset = /obj/item/radio/headset/alt/double/rd + wrist_radio = /obj/item/radio/headset/wrist/rd + clipon_radio = /obj/item/radio/headset/wrist/clip/rd tab_pda = /obj/item/modular_computer/handheld/pda/research/rd wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/research/rd @@ -93,11 +93,11 @@ shoes = /obj/item/clothing/shoes/sneakers/medsci id = /obj/item/card/id/white - headset = /obj/item/device/radio/headset/headset_sci - bowman = /obj/item/device/radio/headset/headset_sci/alt - double_headset = /obj/item/device/radio/headset/alt/double/sci - wrist_radio = /obj/item/device/radio/headset/wrist/sci - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sci + headset = /obj/item/radio/headset/headset_sci + bowman = /obj/item/radio/headset/headset_sci/alt + double_headset = /obj/item/radio/headset/alt/double/sci + wrist_radio = /obj/item/radio/headset/wrist/sci + clipon_radio = /obj/item/radio/headset/wrist/clip/sci tab_pda = /obj/item/modular_computer/handheld/pda/research wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/research @@ -145,11 +145,11 @@ uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist - headset = /obj/item/device/radio/headset/headset_xenology - bowman = /obj/item/device/radio/headset/headset_xenology/alt - double_headset = /obj/item/device/radio/headset/alt/double/xenology - wrist_radio = /obj/item/device/radio/headset/wrist/xenology - clipon_radio = /obj/item/device/radio/headset/wrist/clip/xenology + headset = /obj/item/radio/headset/headset_xenology + bowman = /obj/item/radio/headset/headset_xenology/alt + double_headset = /obj/item/radio/headset/alt/double/xenology + wrist_radio = /obj/item/radio/headset/wrist/xenology + clipon_radio = /obj/item/radio/headset/wrist/clip/xenology /obj/outfit/job/scientist/anomalist name = "Anomalist" @@ -157,11 +157,11 @@ uniform = /obj/item/clothing/under/rank/scientist/anomalist - headset = /obj/item/device/radio/headset/headset_anom - bowman = /obj/item/device/radio/headset/headset_anom/alt - double_headset = /obj/item/device/radio/headset/alt/double/anom - wrist_radio = /obj/item/device/radio/headset/wrist/anom - clipon_radio = /obj/item/device/radio/headset/wrist/clip/anom + headset = /obj/item/radio/headset/headset_anom + bowman = /obj/item/radio/headset/headset_anom/alt + double_headset = /obj/item/radio/headset/alt/double/anom + wrist_radio = /obj/item/radio/headset/wrist/anom + clipon_radio = /obj/item/radio/headset/wrist/clip/anom /datum/job/xenobiologist title = "Xenobiologist" @@ -195,11 +195,11 @@ uniform = /obj/item/clothing/under/rank/scientist/xenobio - headset = /obj/item/device/radio/headset/headset_xenology - bowman = /obj/item/device/radio/headset/headset_xenology/alt - double_headset = /obj/item/device/radio/headset/alt/double/xenology - wrist_radio = /obj/item/device/radio/headset/wrist/xenology - clipon_radio = /obj/item/device/radio/headset/wrist/clip/xenology + headset = /obj/item/radio/headset/headset_xenology + bowman = /obj/item/radio/headset/headset_xenology/alt + double_headset = /obj/item/radio/headset/alt/double/xenology + wrist_radio = /obj/item/radio/headset/wrist/xenology + clipon_radio = /obj/item/radio/headset/wrist/clip/xenology /datum/job/xenobotanist title = "Xenobotanist" @@ -234,11 +234,11 @@ uniform = /obj/item/clothing/under/rank/scientist/botany - headset = /obj/item/device/radio/headset/headset_xenology - bowman = /obj/item/device/radio/headset/headset_xenology/alt - double_headset = /obj/item/device/radio/headset/alt/double/xenology - wrist_radio = /obj/item/device/radio/headset/wrist/xenology - clipon_radio = /obj/item/device/radio/headset/wrist/clip/xenology + headset = /obj/item/radio/headset/headset_xenology + bowman = /obj/item/radio/headset/headset_xenology/alt + double_headset = /obj/item/radio/headset/alt/double/xenology + wrist_radio = /obj/item/radio/headset/wrist/xenology + clipon_radio = /obj/item/radio/headset/wrist/clip/xenology /datum/job/intern_sci title = "Research Intern" @@ -262,11 +262,11 @@ uniform = /obj/item/clothing/under/rank/scientist/intern shoes = /obj/item/clothing/shoes/sneakers/medsci - headset = /obj/item/device/radio/headset/headset_sci - bowman = /obj/item/device/radio/headset/headset_sci/alt - double_headset = /obj/item/device/radio/headset/alt/double/sci - wrist_radio = /obj/item/device/radio/headset/wrist/sci - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sci + headset = /obj/item/radio/headset/headset_sci + bowman = /obj/item/radio/headset/headset_sci/alt + double_headset = /obj/item/radio/headset/alt/double/sci + wrist_radio = /obj/item/radio/headset/wrist/sci + clipon_radio = /obj/item/radio/headset/wrist/clip/sci backpack = /obj/item/storage/backpack/toxins backpack_faction = /obj/item/storage/backpack/nt diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 81cbe21b048..26ba0878753 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -45,11 +45,11 @@ shoes = null glasses = /obj/item/clothing/glasses/sunglasses/sechud/head - headset = /obj/item/device/radio/headset/heads/hos - bowman = /obj/item/device/radio/headset/heads/hos/alt - double_headset = /obj/item/device/radio/headset/alt/double/hos - wrist_radio = /obj/item/device/radio/headset/wrist/hos - clipon_radio = /obj/item/device/radio/headset/wrist/clip/hos + headset = /obj/item/radio/headset/heads/hos + bowman = /obj/item/radio/headset/heads/hos/alt + double_headset = /obj/item/radio/headset/alt/double/hos + wrist_radio = /obj/item/radio/headset/wrist/hos + clipon_radio = /obj/item/radio/headset/wrist/clip/hos tab_pda = /obj/item/modular_computer/handheld/pda/security/hos wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security/hos @@ -110,11 +110,11 @@ glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator shoes = null - headset = /obj/item/device/radio/headset/headset_warden - bowman = /obj/item/device/radio/headset/headset_warden/alt - double_headset = /obj/item/device/radio/headset/alt/double/sec/warden - wrist_radio = /obj/item/device/radio/headset/wrist/sec/warden - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sec/warden + headset = /obj/item/radio/headset/headset_warden + bowman = /obj/item/radio/headset/headset_warden/alt + double_headset = /obj/item/radio/headset/alt/double/sec/warden + wrist_radio = /obj/item/radio/headset/wrist/sec/warden + clipon_radio = /obj/item/radio/headset/wrist/clip/sec/warden tab_pda = /obj/item/modular_computer/handheld/pda/security wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security @@ -172,11 +172,11 @@ uniform = /obj/item/clothing/under/det shoes = /obj/item/clothing/shoes/laceup - headset = /obj/item/device/radio/headset/headset_sec - bowman = /obj/item/device/radio/headset/headset_sec/alt - double_headset = /obj/item/device/radio/headset/alt/double/sec - wrist_radio = /obj/item/device/radio/headset/wrist/sec - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sec + headset = /obj/item/radio/headset/headset_sec + bowman = /obj/item/radio/headset/headset_sec/alt + double_headset = /obj/item/radio/headset/alt/double/sec + wrist_radio = /obj/item/radio/headset/wrist/sec + clipon_radio = /obj/item/radio/headset/wrist/clip/sec tab_pda = /obj/item/modular_computer/handheld/pda/security/detective wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security/detective @@ -231,11 +231,11 @@ uniform = /obj/item/clothing/under/rank/security shoes = null - headset = /obj/item/device/radio/headset/headset_sec - bowman = /obj/item/device/radio/headset/headset_sec/alt - double_headset = /obj/item/device/radio/headset/alt/double/sec - wrist_radio = /obj/item/device/radio/headset/wrist/sec - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sec + headset = /obj/item/radio/headset/headset_sec + bowman = /obj/item/radio/headset/headset_sec/alt + double_headset = /obj/item/radio/headset/alt/double/sec + wrist_radio = /obj/item/radio/headset/wrist/sec + clipon_radio = /obj/item/radio/headset/wrist/clip/sec tab_pda = /obj/item/modular_computer/handheld/pda/security wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/security @@ -299,11 +299,11 @@ suit = /obj/item/clothing/suit/storage/hazardvest/security head = /obj/item/clothing/head/beret/security - headset = /obj/item/device/radio/headset/headset_sec - bowman = /obj/item/device/radio/headset/headset_sec/alt - double_headset = /obj/item/device/radio/headset/alt/double/sec - wrist_radio = /obj/item/device/radio/headset/wrist/sec - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sec + headset = /obj/item/radio/headset/headset_sec + bowman = /obj/item/radio/headset/headset_sec/alt + double_headset = /obj/item/radio/headset/alt/double/sec + wrist_radio = /obj/item/radio/headset/wrist/sec + clipon_radio = /obj/item/radio/headset/wrist/clip/sec backpack = /obj/item/storage/backpack/security satchel = /obj/item/storage/backpack/satchel/sec diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm index 0e3c80f12a4..60b592644a0 100644 --- a/code/game/jobs/job/ship_crew.dm +++ b/code/game/jobs/job/ship_crew.dm @@ -70,42 +70,42 @@ uniform = /obj/item/clothing/under/color/lightpurple suit = /obj/item/clothing/suit/storage/toggle/labcoat glasses = /obj/item/clothing/glasses/safety/goggles/science - headset = /obj/item/device/radio/headset/headset_sci - bowman = /obj/item/device/radio/headset/headset_sci/alt - double_headset = /obj/item/device/radio/headset/alt/double/sci - wrist_radio = /obj/item/device/radio/headset/wrist/sci - clipon_radio = /obj/item/device/radio/headset/wrist/clip/sci + headset = /obj/item/radio/headset/headset_sci + bowman = /obj/item/radio/headset/headset_sci/alt + double_headset = /obj/item/radio/headset/alt/double/sci + wrist_radio = /obj/item/radio/headset/wrist/sci + clipon_radio = /obj/item/radio/headset/wrist/clip/sci /obj/outfit/job/assistant/tech_assistant name = "Technical Assistant" uniform = /obj/item/clothing/under/color/yellowgreen suit = /obj/item/clothing/suit/storage/hazardvest - backpack_contents = list(/obj/item/device/debugger = 1) - headset = /obj/item/device/radio/headset/headset_eng - bowman = /obj/item/device/radio/headset/headset_eng/alt - double_headset = /obj/item/device/radio/headset/alt/double/eng - wrist_radio = /obj/item/device/radio/headset/wrist/eng - clipon_radio = /obj/item/device/radio/headset/wrist/clip/eng + backpack_contents = list(/obj/item/debugger = 1) + headset = /obj/item/radio/headset/headset_eng + bowman = /obj/item/radio/headset/headset_eng/alt + double_headset = /obj/item/radio/headset/alt/double/eng + wrist_radio = /obj/item/radio/headset/wrist/eng + clipon_radio = /obj/item/radio/headset/wrist/clip/eng /obj/outfit/job/assistant/med_assistant name = "Medical Orderly" uniform = /obj/item/clothing/under/color/blue suit = /obj/item/clothing/suit/storage/toggle/labcoat backpack_contents = list(/obj/item/reagent_containers/spray/sterilizine = 1) - headset = /obj/item/device/radio/headset/headset_med - bowman = /obj/item/device/radio/headset/headset_med/alt - double_headset = /obj/item/device/radio/headset/alt/double/med - wrist_radio = /obj/item/device/radio/headset/wrist/med - clipon_radio = /obj/item/device/radio/headset/wrist/clip/med + headset = /obj/item/radio/headset/headset_med + bowman = /obj/item/radio/headset/headset_med/alt + double_headset = /obj/item/radio/headset/alt/double/med + wrist_radio = /obj/item/radio/headset/wrist/med + clipon_radio = /obj/item/radio/headset/wrist/clip/med /obj/outfit/job/assistant/waiter name = "Wait Staff" uniform = /obj/item/clothing/under/waiter - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - clipon_radio = /obj/item/device/radio/headset/wrist/clip/service + headset = /obj/item/radio/headset/headset_service + bowman = /obj/item/radio/headset/headset_service/alt + double_headset = /obj/item/radio/headset/alt/double/service + wrist_radio = /obj/item/radio/headset/wrist/service + clipon_radio = /obj/item/radio/headset/wrist/clip/service /datum/job/visitor title = "Off-Duty Crew Member" diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index b65d4a0b181..d7e37f49894 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -8,12 +8,12 @@ layer = 2.5 anchored = TRUE idle_power_usage = 0 - var/obj/item/device/radio/beacon/beacon + var/obj/item/radio/beacon/beacon /obj/machinery/bluespace_beacon/Initialize(mapload, d, populate_components, is_internal) . = ..() var/turf/T = loc - beacon = new /obj/item/device/radio/beacon/fixed(T) + beacon = new /obj/item/radio/beacon/fixed(T) hide(!T.is_plating()) /obj/machinery/bluespace_beacon/Destroy() diff --git a/code/game/machinery/abstract/intercom_listener.dm b/code/game/machinery/abstract/intercom_listener.dm index 4316a16a03a..566b48941b5 100644 --- a/code/game/machinery/abstract/intercom_listener.dm +++ b/code/game/machinery/abstract/intercom_listener.dm @@ -3,9 +3,9 @@ desc = DESC_PARENT power_channel = AREA_USAGE_EQUIP - var/obj/item/device/radio/intercom/master + var/obj/item/radio/intercom/master -/obj/machinery/abstract/intercom_listener/New(atom/loc, obj/item/device/radio/intercom/owner) +/obj/machinery/abstract/intercom_listener/New(atom/loc, obj/item/radio/intercom/owner) if (QDELETED(owner)) warning("intercom_listener created with QDELETED intercom!") qdel(src) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index cfbb90cce4e..e3f14d068d6 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -456,7 +456,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/mecha_equipment/clamp)) return - if(attacking_item.tool_behaviour != TOOL_WRENCH && !is_type_in_list(attacking_item, list(/obj/item/tank, /obj/item/device/analyzer, /obj/item/modular_computer)) && !issignaler(attacking_item) && (attacking_item.tool_behaviour != TOOL_WIRECUTTER && signaler)) + if(attacking_item.tool_behaviour != TOOL_WRENCH && !is_type_in_list(attacking_item, list(/obj/item/tank, /obj/item/analyzer, /obj/item/modular_computer)) && !issignaler(attacking_item) && (attacking_item.tool_behaviour != TOOL_WIRECUTTER && signaler)) if(attacking_item.item_flags & ITEM_FLAG_NO_BLUDGEON) return TRUE visible_message(SPAN_WARNING("\The [user] hits \the [src] with \the [attacking_item]!"), SPAN_NOTICE("You hit \the [src] with \the [attacking_item].")) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 3737b1c5c48..e78ae420981 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -140,8 +140,8 @@ to_chat(user, SPAN_NOTICE("Nothing happens.")) return TRUE - else if ((istype(attacking_item, /obj/item/device/analyzer)) && Adjacent(user)) - var/obj/item/device/analyzer/A = attacking_item + else if ((istype(attacking_item, /obj/item/analyzer)) && Adjacent(user)) + var/obj/item/analyzer/A = attacking_item A.analyze_gases(src, user) return TRUE diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index 8f6b97806f7..2a30c6922f4 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -9,7 +9,7 @@ /obj/item/circuitboard/bodyscanner, /obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/scanning_module = 2, - /obj/item/device/healthanalyzer + /obj/item/healthanalyzer ) idle_power_usage = 60 active_power_usage = 10000 //10 kW. It's a big all-body scanner. diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 4b9aeb905e1..96269616eca 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -9,7 +9,7 @@ matter = list(MATERIAL_ALUMINIUM = 700, MATERIAL_GLASS = 300) // Motion, EMP-Proof, X-Ray - var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/stock_parts/scanning_module) + var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/stock_parts/scanning_module) var/list/upgrades = list() var/camera_name var/camera_network diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 511cb9ef098..242cd1bfa26 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(engineering_networks, list( return null /obj/machinery/camera/proc/isMotion() - var/O = locate(/obj/item/device/assembly/prox_sensor) in assembly.upgrades + var/O = locate(/obj/item/assembly/prox_sensor) in assembly.upgrades return O // UPGRADE PROCS @@ -197,7 +197,7 @@ GLOBAL_LIST_INIT(engineering_networks, list( update_coverage() /obj/machinery/camera/proc/upgradeMotion() - assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly)) + assembly.upgrades.Add(new /obj/item/assembly/prox_sensor(assembly)) setPowerUsage() if(!(SSmachinery.processing[src])) START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 60a3ddf3f3c..3625ca2e276 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -9,7 +9,7 @@ var/state = 0 var/datum/ai_laws/laws = new /datum/ai_laws/conglomerate var/obj/item/circuitboard/circuit = null - var/obj/item/device/mmi/brain = null + var/obj/item/mmi/brain = null /obj/structure/AIcore/attackby(obj/item/attacking_item, mob/user) @@ -134,8 +134,8 @@ to_chat(usr, "Added a freeform law.") return TRUE - if(istype(attacking_item, /obj/item/device/mmi)) - var/obj/item/device/mmi/M = attacking_item + if(istype(attacking_item, /obj/item/mmi)) + var/obj/item/mmi/M = attacking_item if(!M.ready_for_use(user)) return TRUE if(jobban_isbanned(M.brainmob, "AI")) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 10080cee045..390319cf537 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -203,7 +203,7 @@ var/time_till_despawn = 1200 // Two minute safe period before being despawned. var/time_till_force_cryo = 3000 // Five minutes safe period until they're despawned even if active. var/time_entered = 0 // Used to keep track of the safe period. - var/obj/item/device/radio/intercom/announce + var/obj/item/radio/intercom/announce var/obj/machinery/computer/cryopod/control_computer @@ -213,8 +213,8 @@ /obj/item/implant, /obj/item/card/id, /obj/item/modular_computer, - /obj/item/device/radio/headset, - /obj/item/device/encryptionkey + /obj/item/radio/headset, + /obj/item/encryptionkey ) //For subtypes of the blacklist that are allowed to be kept @@ -352,8 +352,8 @@ occupant.drop_from_inventory(W, src) //Prepare items tnat require modification before dropping for(var/obj/item/W in items) - if(istype(W, /obj/item/device/mmi)) - var/obj/item/device/mmi/brain = W + if(istype(W, /obj/item/mmi)) + var/obj/item/mmi/brain = W if(brain.brainmob && brain.brainmob.client && brain.brainmob.key) brain.forceMove(T) items -= brain diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index fa42a20d0be..2561c0baac7 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -90,7 +90,7 @@ /// Wires datum. var/datum/wires/airlock/wires /// Any active brace. - var/obj/item/device/magnetic_lock/bracer + var/obj/item/magnetic_lock/bracer /// If the panel is visible when open. var/panel_visible_while_open = FALSE @@ -282,7 +282,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/H = usr var/list/modifiers = params2list(params) - var/obj/item/device/paint_sprayer/paint_sprayer = H.get_active_hand() + var/obj/item/paint_sprayer/paint_sprayer = H.get_active_hand() if(istype(paint_sprayer)) if(!istype(H.buckled_to)) H.face_atom(src) @@ -1753,11 +1753,11 @@ About the new airlock wires panel: if (!cut_bolts(attacking_item,user)) return ..() return TRUE - if (istype(attacking_item, /obj/item/device/magnetic_lock)) + if (istype(attacking_item, /obj/item/magnetic_lock)) if (bracer) to_chat(user, SPAN_NOTICE("There is already a [bracer] on [src]!")) return TRUE - var/obj/item/device/magnetic_lock/newbracer = attacking_item + var/obj/item/magnetic_lock/newbracer = attacking_item newbracer.attachto(src, user) return TRUE if(!repairing && (attacking_item.tool_behaviour == TOOL_WELDER && !( src.operating > 0 ) && src.density)) @@ -1794,9 +1794,9 @@ About the new airlock wires panel: return src.attack_hand(user) else if(attacking_item.tool_behaviour == TOOL_MULTITOOL) return src.attack_hand(user) - else if(istype(attacking_item, /obj/item/device/assembly/signaler)) + else if(istype(attacking_item, /obj/item/assembly/signaler)) return src.attack_hand(user) - else if(istype(attacking_item, /obj/item/device/paint_sprayer)) + else if(istype(attacking_item, /obj/item/paint_sprayer)) return FALSE else if(istype(attacking_item, /obj/item/pai_cable)) // -- TLE var/obj/item/pai_cable/cable = attacking_item diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 4142a860a4b..a8da4f9dbce 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -151,7 +151,7 @@ Class Procs: var/clicksound //played sound on usage var/clickvol = 40 //volume /// Signaller attached to the machine - var/obj/item/device/assembly/signaler/signaler + var/obj/item/assembly/signaler/signaler /// Overmap sector the machine is linked to var/obj/effect/overmap/visitable/linked @@ -355,7 +355,7 @@ Class Procs: if(signaler) to_chat(user, SPAN_WARNING("\The [src] already has a signaler attached.")) return TRUE - var/obj/item/device/assembly/signaler/S = attacking_item + var/obj/item/assembly/signaler/S = attacking_item user.drop_from_inventory(attacking_item, src) signaler = S S.machine = src @@ -379,7 +379,7 @@ Class Procs: LOG_DEBUG("[src] tried to drop a signaler, but it had no turf ([src.x]-[src.y]-[src.z])") return - var/obj/item/device/assembly/signaler/S = signaler + var/obj/item/assembly/signaler/S = signaler signaler.forceMove(detach_turf) signaler.machine = null diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 5a356a181c6..f37586faa48 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -371,7 +371,7 @@ if(prob(50)) new /obj/item/stack/material/steel(loc, rand(1,4)) if(prob(50)) - new /obj/item/device/assembly/prox_sensor(loc) + new /obj/item/assembly/prox_sensor(loc) else to_chat(user, SPAN_NOTICE("You remove the turret but did not manage to salvage anything.")) qdel(src) // qdel @@ -1105,7 +1105,7 @@ if(5) to_chat(user, SPAN_NOTICE("You remove the prox sensor from the turret frame.")) - new /obj/item/device/assembly/prox_sensor(loc) + new /obj/item/assembly/prox_sensor(loc) build_step = 4 /obj/machinery/porta_turret_construct/attack_ai() diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 5066894e4a3..9f0e3256fc2 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -20,11 +20,11 @@ /obj/item/cell, /obj/item/modular_computer, /obj/item/computer_hardware/battery_module, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/clothing/mask/smokable/ecig, /obj/item/inductive_charger/handheld, /obj/item/auto_cpr, - /obj/item/device/personal_shield + /obj/item/personal_shield ) var/icon_state_charged = "recharger100" var/icon_state_charging = "recharger" @@ -190,7 +190,7 @@ allowed_devices = list( /obj/item/gun/energy, /obj/item/melee/baton, - /obj/item/device/flashlight + /obj/item/flashlight ) icon_state_charged = "wrecharger100" icon_state_charging = "wrecharger" diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm index 259b1916217..a958abe7482 100644 --- a/code/game/machinery/telecomms/broadcasting.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -153,25 +153,25 @@ var/list/all_radios_of_our_frequency = SSradio.get_devices(frequency, RADIO_CHAT) radios = all_radios_of_our_frequency.Copy() - for (var/obj/item/device/radio/subspace_radio in radios) + for (var/obj/item/radio/subspace_radio in radios) if(!subspace_radio.can_receive(frequency, signal_reaches_every_z_level)) radios -= subspace_radio // Cool antag radios can hear all Horizon comms for (var/antag_freq in list(SYND_FREQ, RAID_FREQ, NINJ_FREQ)) - for (var/obj/item/device/radio/syndicate_radios in SSradio.get_devices(antag_freq, RADIO_CHAT)) + for (var/obj/item/radio/syndicate_radios in SSradio.get_devices(antag_freq, RADIO_CHAT)) if(syndicate_radios.can_receive(antag_freq, signal_reaches_every_z_level)) radios |= syndicate_radios if (TRANSMISSION_RADIO) // Only radios not in subspace mode - for (var/obj/item/device/radio/non_subspace_radio in SSradio.get_devices(frequency, RADIO_CHAT)) + for (var/obj/item/radio/non_subspace_radio in SSradio.get_devices(frequency, RADIO_CHAT)) if(!non_subspace_radio.subspace_transmission && non_subspace_radio.can_receive(frequency, levels)) radios += non_subspace_radio if (TRANSMISSION_SUPERSPACE) // Independent radios - for (var/obj/item/device/radio/indie_radio in SSradio.get_devices(frequency, RADIO_CHAT)) + for (var/obj/item/radio/indie_radio in SSradio.get_devices(frequency, RADIO_CHAT)) if(indie_radio.independent && indie_radio.can_receive(frequency, levels)) radios += indie_radio diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 59c71321bcc..5091bd8172b 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -116,7 +116,7 @@ return interact(user, user.get_multitool()) -/obj/machinery/telecomms/interact(mob/user, var/obj/item/device/multitool/M) +/obj/machinery/telecomms/interact(mob/user, var/obj/item/multitool/M) if(!M) M = user.get_multitool() var/dat @@ -229,7 +229,7 @@ if(stat & (BROKEN|NOPOWER)) return - var/obj/item/device/multitool/P = usr.get_multitool() + var/obj/item/multitool/P = usr.get_multitool() if(href_list["input"]) switch(href_list["input"]) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 0ff57e90374..ab31edc9618 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -172,7 +172,7 @@ // actor check for radio headset if(SSodyssey.scenario?.radio_frequency_name) var/mob/living/living = user - if(istype(living) && !living.check_contents_for(/obj/item/device/radio/headset/ship/odyssey)) + if(istype(living) && !living.check_contents_for(/obj/item/radio/headset/ship/odyssey)) var/choice = tgui_alert(user, "Current odyssey scenario has defined radio channel, but you do not seem to have a headset that can transmit that channel. You can get one from the actor vendor.", "Teleport Warning", list("Continue Teleport", "Cancel Teleport") diff --git a/code/game/machinery/vending/_vending.dm b/code/game/machinery/vending/_vending.dm index ac27f1f9c51..36e64ce7199 100644 --- a/code/game/machinery/vending/_vending.dm +++ b/code/game/machinery/vending/_vending.dm @@ -365,7 +365,7 @@ return 1 /obj/machinery/vending/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/debugger)) + if(istype(attacking_item, /obj/item/debugger)) if(!shut_up) to_chat(user, SPAN_WARNING("\The [attacking_item] reads, \"Software error detected. Rectifying.\".")) if(attacking_item.use_tool(src, user, 100, volume = 50)) @@ -452,9 +452,9 @@ power_change() return TRUE - else if(istype(attacking_item,/obj/item/device/vending_refill)) + else if(istype(attacking_item,/obj/item/vending_refill)) if(panel_open) - var/obj/item/device/vending_refill/VR = attacking_item + var/obj/item/vending_refill/VR = attacking_item if(VR.charges) if(VR.vend_id == vend_id) VR.restock_inventory(src) @@ -983,7 +983,7 @@ * Arguments: * * canister - the vending canister we are refilling from */ -/obj/item/device/vending_refill +/obj/item/vending_refill name = "resupply canister" desc = "A vending machine restock cart." icon = 'icons/obj/assemblies/electronic_setups.dmi' @@ -997,14 +997,14 @@ var/vend_id = "generic" var/charges = 0 -/obj/item/device/vending_refill/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/vending_refill/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(charges > 0) . += "It can restock [charges] item(s)." else . += SPAN_WARNING("It's empty!") -/obj/item/device/vending_refill/proc/restock_inventory(var/obj/machinery/vending/vendor) +/obj/item/vending_refill/proc/restock_inventory(var/obj/machinery/vending/vendor) if(vendor) for(var/datum/data/vending_product/product in vendor.product_records) if(product.amount < product.max_amount) diff --git a/code/game/machinery/vending/antagclothes.dm b/code/game/machinery/vending/antagclothes.dm index 9d5c9ef626f..6cf21282137 100644 --- a/code/game/machinery/vending/antagclothes.dm +++ b/code/game/machinery/vending/antagclothes.dm @@ -11,7 +11,7 @@ icon_vend = "generic-vend" light_mask = "generic-lightmask" products = list( - /obj/item/device/radio/headset/ship/odyssey = 12, + /obj/item/radio/headset/ship/odyssey = 12, /obj/item/portable_map_reader/odyssey = 12, /obj/item/card/id/syndicate = 12, /obj/item/storage/box/syndie_kit/chameleon = 12, @@ -36,7 +36,7 @@ If you want to expand this to more than primarily generic items, I recommend des random_itemcount = FALSE products = list ( // This item allows players to change the colour of recolourable items from this vendor without needing admin intervention. - /obj/item/device/clothes_dyer = 6, + /obj/item/clothes_dyer = 6, // Generic suits. /obj/item/clothing/suit/storage/toggle/labcoat = 6, diff --git a/code/game/machinery/vending/booze.dm b/code/game/machinery/vending/booze.dm index d4dc9155113..eaaa1f953db 100644 --- a/code/game/machinery/vending/booze.dm +++ b/code/game/machinery/vending/booze.dm @@ -103,7 +103,7 @@ light_color = COLOR_PALE_BLUE_GRAY ui_size = 60 -/obj/item/device/vending_refill/booze +/obj/item/vending_refill/booze name = "booze resupply canister" vend_id = "booze" charges = 100 //holy shit that's a lot of booze diff --git a/code/game/machinery/vending/cigarette.dm b/code/game/machinery/vending/cigarette.dm index 57c7ed06afa..6ee5625a5f3 100644 --- a/code/game/machinery/vending/cigarette.dm +++ b/code/game/machinery/vending/cigarette.dm @@ -166,7 +166,7 @@ /obj/item/reagent_containers/ecig_cartridge/high_nicotine = 10 ) -/obj/item/device/vending_refill/smokes +/obj/item/vending_refill/smokes name = "smokes resupply canister" vend_id = "smokes" charges = 25 diff --git a/code/game/machinery/vending/engitech.dm b/code/game/machinery/vending/engitech.dm index f778598e0f9..05e87353cad 100644 --- a/code/game/machinery/vending/engitech.dm +++ b/code/game/machinery/vending/engitech.dm @@ -19,26 +19,26 @@ vend_id = "robo-tools" products = list( /obj/item/stack/cable_coil = 4, - /obj/item/device/flash/synthetic = 4, + /obj/item/flash/synthetic = 4, /obj/item/cell/high = 12, - /obj/item/device/assembly/prox_sensor = 8, - /obj/item/device/assembly/signaler = 8, - /obj/item/device/healthanalyzer = 3, + /obj/item/assembly/prox_sensor = 8, + /obj/item/assembly/signaler = 8, + /obj/item/healthanalyzer = 3, /obj/item/surgery/scalpel = 2, /obj/item/surgery/circular_saw = 2, /obj/item/screwdriver = 5, /obj/item/crowbar = 5 ) contraband = list( - /obj/item/device/flash = 2 + /obj/item/flash = 2 ) premium = list( - /obj/item/device/paicard = 2 + /obj/item/paicard = 2 ) //everything after the power cell had no amounts, I improvised. -Sayu restock_blocked_items = list( /obj/item/stack/cable_coil, - /obj/item/device/flash, + /obj/item/flash, /obj/item/light/tube ) restock_items = TRUE @@ -46,7 +46,7 @@ light_color = COLOR_BABY_BLUE manufacturer = "hephaestus" -/obj/item/device/vending_refill/robo +/obj/item/vending_refill/robo name = "robo-tools resupply canister" vend_id = "robo-tools" charges = 38 @@ -59,7 +59,7 @@ req_access = list(ACCESS_ENGINE) vend_id = "tools" products = list( - /obj/item/device/multitool = 4, + /obj/item/multitool = 4, /obj/item/taperoll/engineering = 4, /obj/item/clothing/glasses/safety/goggles = 4, /obj/item/airlock_electronics = 20, @@ -68,7 +68,7 @@ /obj/item/firealarm_electronics = 10, /obj/item/cell/high = 10, /obj/item/grenade/chem_grenade/antifuel = 5, - /obj/item/device/geiger = 5 + /obj/item/geiger = 5 ) contraband = list( /obj/item/cell/potato = 3 @@ -83,7 +83,7 @@ /obj/machinery/vending/engivend/low_supply products = list( - /obj/item/device/multitool = 2, + /obj/item/multitool = 2, /obj/item/taperoll/engineering = 2, /obj/item/clothing/glasses/safety/goggles = 3, /obj/item/airlock_electronics = 12, @@ -92,7 +92,7 @@ /obj/item/firealarm_electronics = 8, /obj/item/cell/high = 4, /obj/item/grenade/chem_grenade/antifuel = 3, - /obj/item/device/geiger = 1 + /obj/item/geiger = 1 ) /obj/machinery/vending/tool @@ -108,8 +108,8 @@ /obj/item/weldingtool = 3, /obj/item/wirecutters = 5, /obj/item/wrench = 5, - /obj/item/device/analyzer = 5, - /obj/item/device/t_scanner = 5, + /obj/item/analyzer = 5, + /obj/item/t_scanner = 5, /obj/item/screwdriver = 5, /obj/item/tape_roll = 3, /obj/item/hammer = 5 @@ -138,8 +138,8 @@ /obj/item/weldingtool = 1, /obj/item/wirecutters = 2, /obj/item/wrench = 2, - /obj/item/device/analyzer = 3, - /obj/item/device/t_scanner = 2, + /obj/item/analyzer = 3, + /obj/item/t_scanner = 2, /obj/item/screwdriver = 3, /obj/item/tape_roll = 1, /obj/item/hammer = 1 @@ -161,12 +161,12 @@ /obj/item/screwdriver = 8, /obj/item/crowbar = 8, /obj/item/wirecutters = 8, - /obj/item/device/multitool = 8, + /obj/item/multitool = 8, /obj/item/wrench = 8, - /obj/item/device/t_scanner = 8, + /obj/item/t_scanner = 8, /obj/item/stack/cable_coil/random = 10, /obj/item/cell = 5, - /obj/item/device/analyzer = 5, + /obj/item/analyzer = 5, /obj/item/cell/high = 2, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, @@ -190,7 +190,7 @@ light_color = COLOR_GOLD manufacturer = "hephaestus" -/obj/item/device/vending_refill/tools +/obj/item/vending_refill/tools name = "tools resupply canister" vend_id = "tools" charges = 25 @@ -205,25 +205,25 @@ req_access = list(ACCESS_HOP) vend_id = "encryption" products = list( - /obj/item/device/encryptionkey/heads/captain = 1, - /obj/item/device/encryptionkey/heads/ce = 1, - /obj/item/device/encryptionkey/heads/cmo = 1, - /obj/item/device/encryptionkey/heads/hos = 1, - /obj/item/device/encryptionkey/heads/rd = 1, - /obj/item/device/encryptionkey/heads/xo = 1, - /obj/item/device/encryptionkey/headset_operations_manager = 1, - /obj/item/device/encryptionkey/headset_com = 5, - /obj/item/device/encryptionkey/headset_cargo = 5, - /obj/item/device/encryptionkey/headset_eng = 5, - /obj/item/device/encryptionkey/headset_med = 5, - /obj/item/device/encryptionkey/headset_sci = 5, - /obj/item/device/encryptionkey/headset_sec = 5, - /obj/item/device/encryptionkey/headset_service = 5, - /obj/item/device/encryptionkey/headset_warden = 5, - /obj/item/device/encryptionkey/headset_xenology = 5, + /obj/item/encryptionkey/heads/captain = 1, + /obj/item/encryptionkey/heads/ce = 1, + /obj/item/encryptionkey/heads/cmo = 1, + /obj/item/encryptionkey/heads/hos = 1, + /obj/item/encryptionkey/heads/rd = 1, + /obj/item/encryptionkey/heads/xo = 1, + /obj/item/encryptionkey/headset_operations_manager = 1, + /obj/item/encryptionkey/headset_com = 5, + /obj/item/encryptionkey/headset_cargo = 5, + /obj/item/encryptionkey/headset_eng = 5, + /obj/item/encryptionkey/headset_med = 5, + /obj/item/encryptionkey/headset_sci = 5, + /obj/item/encryptionkey/headset_sec = 5, + /obj/item/encryptionkey/headset_service = 5, + /obj/item/encryptionkey/headset_warden = 5, + /obj/item/encryptionkey/headset_xenology = 5, ) -/obj/item/device/vending_refill/encryption +/obj/item/vending_refill/encryption name = "encryption key resupply canister" vend_id = "encryption" charges = 60 @@ -235,19 +235,19 @@ icon_vend = "generic-vend" light_mask = "generic-lightmask" products = list( - /obj/item/device/assembly/prox_sensor = 15, - /obj/item/device/assembly/igniter = 15, - /obj/item/device/assembly/signaler = 15, - /obj/item/device/assembly/timer = 15, + /obj/item/assembly/prox_sensor = 15, + /obj/item/assembly/igniter = 15, + /obj/item/assembly/signaler = 15, + /obj/item/assembly/timer = 15, /obj/item/wirecutters = 5 ) contraband = list( - /obj/item/device/flashlight = 5, - /obj/item/device/assembly/infra = 6, - /obj/item/device/assembly/voice = 6 + /obj/item/flashlight = 5, + /obj/item/assembly/infra = 6, + /obj/item/assembly/voice = 6 ) premium = list( - /obj/item/device/multitool/ = 2 + /obj/item/multitool/ = 2 ) product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!" restock_items = TRUE @@ -262,11 +262,11 @@ contraband = null random_itemcount = 0 products = list( - /obj/item/device/assembly/prox_sensor = 25, - /obj/item/device/assembly/signaler = 25, - /obj/item/device/assembly/infra = 25, - /obj/item/device/assembly/prox_sensor = 25, + /obj/item/assembly/prox_sensor = 25, + /obj/item/assembly/signaler = 25, + /obj/item/assembly/infra = 25, + /obj/item/assembly/prox_sensor = 25, /obj/item/handcuffs = 8, - /obj/item/device/flash = 4, + /obj/item/flash = 4, /obj/item/clothing/glasses/sunglasses = 4 ) diff --git a/code/game/machinery/vending/hotdrinks.dm b/code/game/machinery/vending/hotdrinks.dm index 6bc82deffbf..5a22f347272 100644 --- a/code/game/machinery/vending/hotdrinks.dm +++ b/code/game/machinery/vending/hotdrinks.dm @@ -69,7 +69,7 @@ /obj/item/reagent_containers/food/snacks/donut/normal = 2 ) -/obj/item/device/vending_refill/coffee +/obj/item/vending_refill/coffee name = "coffee resupply canister" vend_id = "coffee" charges = 38 diff --git a/code/game/machinery/vending/hydro.dm b/code/game/machinery/vending/hydro.dm index a4a90d362cf..224f7eab1ca 100644 --- a/code/game/machinery/vending/hydro.dm +++ b/code/game/machinery/vending/hydro.dm @@ -56,7 +56,7 @@ /obj/item/plantspray/pests = 20, /obj/item/reagent_containers/syringe = 6, /obj/item/storage/bag/plants = 6, - /obj/item/device/analyzer/plant_analyzer = 2, + /obj/item/analyzer/plant_analyzer = 2, /obj/item/material/minihoe = 2, /obj/item/material/hatchet = 2, /obj/item/wirecutters/clippers = 2, @@ -72,7 +72,7 @@ /obj/item/plantspray/pests = 12, /obj/item/reagent_containers/syringe = 4, /obj/item/storage/bag/plants = 2, - /obj/item/device/analyzer/plant_analyzer = 1, + /obj/item/analyzer/plant_analyzer = 1, /obj/item/material/minihoe = 1, /obj/item/material/hatchet = 1, /obj/item/wirecutters/clippers = 1, @@ -92,7 +92,7 @@ /obj/item/plantspray/pests = 10, /obj/item/reagent_containers/syringe = 6, /obj/item/storage/bag/plants = 6, - /obj/item/device/analyzer/plant_analyzer = 2, + /obj/item/analyzer/plant_analyzer = 2, /obj/item/material/minihoe = 2, /obj/item/material/hatchet = 2, /obj/item/wirecutters/clippers = 2, @@ -155,7 +155,7 @@ /obj/item/reagent_containers/spray/plantbgone = 1 ) -/obj/item/device/vending_refill/hydro +/obj/item/vending_refill/hydro name = "hydro resupply canister" vend_id = "hydro" charges = 23 @@ -331,7 +331,7 @@ random_itemcount = 0 light_color = COLOR_BABY_BLUE -/obj/item/device/vending_refill/seeds +/obj/item/vending_refill/seeds name = "resupply canister" vend_id = SEED_NOUN_SEEDS charges = 175 diff --git a/code/game/machinery/vending/medical.dm b/code/game/machinery/vending/medical.dm index ec50e2ec3d2..380132e3c00 100644 --- a/code/game/machinery/vending/medical.dm +++ b/code/game/machinery/vending/medical.dm @@ -26,8 +26,8 @@ /obj/item/reagent_containers/glass/bottle/coagzolug = 2, /obj/item/reagent_containers/glass/bottle/thetamycin = 2, /obj/item/reagent_containers/syringe = 12, - /obj/item/device/healthanalyzer = 5, - /obj/item/device/breath_analyzer = 2, + /obj/item/healthanalyzer = 5, + /obj/item/breath_analyzer = 2, /obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 2, /obj/item/stack/medical/bruise_pack = 5, @@ -60,7 +60,7 @@ /obj/item/reagent_containers/glass/bottle/toxin = 1, /obj/item/reagent_containers/glass/bottle/thetamycin = 1, /obj/item/reagent_containers/syringe = 8, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/bruise_pack = 2, /obj/item/stack/medical/ointment = 1, /obj/item/stack/medical/splint = 1, @@ -88,8 +88,8 @@ /obj/item/storage/box/fancy/med_pouch/burn = 1, /obj/item/storage/box/fancy/med_pouch/oxyloss = 1, /obj/item/storage/box/fancy/med_pouch/toxin = 1, - /obj/item/device/healthanalyzer = 1, - /obj/item/device/breath_analyzer = 1 + /obj/item/healthanalyzer = 1, + /obj/item/breath_analyzer = 1 ) contraband = list( /obj/item/reagent_containers/syringe/dylovene = 4, @@ -129,8 +129,8 @@ /obj/item/storage/box/fancy/med_pouch/oxyloss = 1, /obj/item/storage/box/fancy/med_pouch/toxin = 1, /obj/item/storage/box/fancy/med_pouch/radiation = 1, - /obj/item/device/healthanalyzer = 1, - /obj/item/device/breath_analyzer = 1 + /obj/item/healthanalyzer = 1, + /obj/item/breath_analyzer = 1 ) contraband = list( /obj/item/reagent_containers/pill/tox = 3 @@ -152,7 +152,7 @@ /obj/item/storage/box/fancy/med_pouch/radiation = 1 ) -/obj/item/device/vending_refill/meds +/obj/item/vending_refill/meds name = "meds resupply canister" vend_id = "meds" charges = 38 diff --git a/code/game/machinery/vending/misc_offship.dm b/code/game/machinery/vending/misc_offship.dm index d41ed92735f..698479a616c 100644 --- a/code/game/machinery/vending/misc_offship.dm +++ b/code/game/machinery/vending/misc_offship.dm @@ -35,10 +35,10 @@ /obj/item/grenade/fake = 2, /obj/item/eightball/haunted = 5, /obj/item/spirit_board = 5, - /obj/item/device/flashlight/maglight = 5, + /obj/item/flashlight/maglight = 5, /obj/item/contraband/poster = 5, /obj/item/spacecash/ewallet/lotto = 15, - /obj/item/device/laser_pointer = 5, + /obj/item/laser_pointer = 5, /obj/item/beach_ball = 1, /obj/item/material/knife/butterfly/switchblade = 2, /obj/item/reagent_containers/hypospray/autoinjector/stimpack = 2, diff --git a/code/game/machinery/vending/miscellaneous.dm b/code/game/machinery/vending/miscellaneous.dm index 0a4736c5a60..2f899cb647b 100644 --- a/code/game/machinery/vending/miscellaneous.dm +++ b/code/game/machinery/vending/miscellaneous.dm @@ -16,16 +16,16 @@ /obj/item/clothing/under/rank/scientist = 6, /obj/item/clothing/suit/hazmat = 6, /obj/item/clothing/head/hazmat = 6, - /obj/item/device/transfer_valve = 6, - /obj/item/device/assembly/timer = 6, - /obj/item/device/assembly/signaler = 6, - /obj/item/device/assembly/igniter = 6 + /obj/item/transfer_valve = 6, + /obj/item/assembly/timer = 6, + /obj/item/assembly/signaler = 6, + /obj/item/assembly/igniter = 6 ) contraband = list( - /obj/item/device/assembly/prox_sensor = 4, - /obj/item/device/assembly/infra = 4, - /obj/item/device/assembly/mousetrap = 4, - /obj/item/device/assembly/voice = 4 + /obj/item/assembly/prox_sensor = 4, + /obj/item/assembly/infra = 4, + /obj/item/assembly/mousetrap = 4, + /obj/item/assembly/voice = 4 ) premium = list( /obj/item/clothing/head/collectable/petehat = 1 @@ -72,7 +72,7 @@ random_itemcount = FALSE light_color = COLOR_BABY_BLUE -/obj/item/device/vending_refill/battlemonsters +/obj/item/vending_refill/battlemonsters name = "Battlemonsters resupply canister" vend_id = "battlemonsters" charges = 40 diff --git a/code/game/machinery/vending/restocker.dm b/code/game/machinery/vending/restocker.dm index 260ccff3926..7cc32469f9f 100644 --- a/code/game/machinery/vending/restocker.dm +++ b/code/game/machinery/vending/restocker.dm @@ -11,21 +11,21 @@ vend_id = "admin" req_access = list(ACCESS_JANITOR) products = list( - /obj/item/device/vending_refill/booze = 2, - /obj/item/device/vending_refill/tools = 2, - /obj/item/device/vending_refill/coffee = 2, - /obj/item/device/vending_refill/snack = 2, - /obj/item/device/vending_refill/cola = 2, - /obj/item/device/vending_refill/zora = 2, - /obj/item/device/vending_refill/frontiervend = 2, - /obj/item/device/vending_refill/smokes = 2, - /obj/item/device/vending_refill/meds = 2, - /obj/item/device/vending_refill/robust = 2, - /obj/item/device/vending_refill/hydro = 2, - /obj/item/device/vending_refill/cutlery = 2, - /obj/item/device/vending_refill/robo = 2, - /obj/item/device/vending_refill/battlemonsters = 2, - /obj/item/device/vending_refill/encryption = 2 + /obj/item/vending_refill/booze = 2, + /obj/item/vending_refill/tools = 2, + /obj/item/vending_refill/coffee = 2, + /obj/item/vending_refill/snack = 2, + /obj/item/vending_refill/cola = 2, + /obj/item/vending_refill/zora = 2, + /obj/item/vending_refill/frontiervend = 2, + /obj/item/vending_refill/smokes = 2, + /obj/item/vending_refill/meds = 2, + /obj/item/vending_refill/robust = 2, + /obj/item/vending_refill/hydro = 2, + /obj/item/vending_refill/cutlery = 2, + /obj/item/vending_refill/robo = 2, + /obj/item/vending_refill/battlemonsters = 2, + /obj/item/vending_refill/encryption = 2 ) random_itemcount = 0 light_color = COLOR_GOLD @@ -33,13 +33,13 @@ /obj/machinery/vending/vendors/low_supply products = list( - /obj/item/device/vending_refill/tools = 1, - /obj/item/device/vending_refill/coffee = 1, - /obj/item/device/vending_refill/meds = 1, - /obj/item/device/vending_refill/robust = 1, - /obj/item/device/vending_refill/hydro = 1, - /obj/item/device/vending_refill/cutlery = 1, - /obj/item/device/vending_refill/robo = 1, - /obj/item/device/vending_refill/battlemonsters = 1, - /obj/item/device/vending_refill/encryption = 1 + /obj/item/vending_refill/tools = 1, + /obj/item/vending_refill/coffee = 1, + /obj/item/vending_refill/meds = 1, + /obj/item/vending_refill/robust = 1, + /obj/item/vending_refill/hydro = 1, + /obj/item/vending_refill/cutlery = 1, + /obj/item/vending_refill/robo = 1, + /obj/item/vending_refill/battlemonsters = 1, + /obj/item/vending_refill/encryption = 1 ) diff --git a/code/game/machinery/vending/security.dm b/code/game/machinery/vending/security.dm index 00ef9b9d1d4..b3f9d21a712 100644 --- a/code/game/machinery/vending/security.dm +++ b/code/game/machinery/vending/security.dm @@ -15,12 +15,12 @@ products = list( /obj/item/handcuffs = 8, /obj/item/grenade/chem_grenade/teargas = 4, - /obj/item/device/flash = 5, + /obj/item/flash = 5, /obj/item/reagent_containers/spray/pepper = 5, /obj/item/storage/box/evidence = 6, - /obj/item/device/holowarrant = 5, - /obj/item/device/flashlight/maglight = 5, - /obj/item/device/hailer = 5, + /obj/item/holowarrant = 5, + /obj/item/flashlight/maglight = 5, + /obj/item/hailer = 5, /obj/item/reagent_containers/food/snacks/donut/normal = 6 ) premium = list( @@ -34,7 +34,7 @@ restock_blocked_items = list( /obj/item/storage/box/fancy/donut, /obj/item/storage/box/evidence, - /obj/item/device/flash, + /obj/item/flash, /obj/item/reagent_containers/spray/pepper ) restock_items = TRUE @@ -46,15 +46,15 @@ products = list( /obj/item/handcuffs = 2, /obj/item/grenade/chem_grenade/teargas = 1, - /obj/item/device/flash = 2, + /obj/item/flash = 2, /obj/item/reagent_containers/spray/pepper = 2, /obj/item/storage/box/evidence = 4, - /obj/item/device/holowarrant = 3, - /obj/item/device/flashlight/maglight = 2, - /obj/item/device/hailer = 1 + /obj/item/holowarrant = 3, + /obj/item/flashlight/maglight = 2, + /obj/item/hailer = 1 ) -/obj/item/device/vending_refill/robust +/obj/item/vending_refill/robust name = "security resupply canister" vend_id = "security" charges = 25 @@ -104,7 +104,7 @@ /obj/item/ammo_magazine/a556 = 12, /obj/item/ammo_magazine/a556/ap = 4, /obj/item/material/knife/tacknife = 4, - /obj/item/device/firing_pin = 12 + /obj/item/firing_pin = 12 ) contraband = list( /obj/item/gun/bang/deagle = 1 diff --git a/code/game/machinery/vending/service.dm b/code/game/machinery/vending/service.dm index 557f973e2cc..3825f8fbdf9 100644 --- a/code/game/machinery/vending/service.dm +++ b/code/game/machinery/vending/service.dm @@ -118,7 +118,7 @@ /obj/item/tray/tea = 2, ) -/obj/item/device/vending_refill/cutlery +/obj/item/vending_refill/cutlery name = "cutlery resupply canister" vend_id = "cutlery" charges = 50 diff --git a/code/game/machinery/vending/snacks.dm b/code/game/machinery/vending/snacks.dm index 2fe61e33787..ce872f02128 100644 --- a/code/game/machinery/vending/snacks.dm +++ b/code/game/machinery/vending/snacks.dm @@ -199,7 +199,7 @@ /obj/item/reagent_containers/food/drinks/zobo = 1.75 ) -/obj/item/device/vending_refill/snack +/obj/item/vending_refill/snack name = "snacks resupply canister" vend_id = "snacks" charges = 38 @@ -305,7 +305,7 @@ desc = "A complimentary FrontierVend machine. No money? No worries." prices = list() -/obj/item/device/vending_refill/frontiervend +/obj/item/vending_refill/frontiervend name = "frontiervend resupply canister" vend_id = "frontiervend" charges = 220 diff --git a/code/game/machinery/vending/soda.dm b/code/game/machinery/vending/soda.dm index 9452802611d..a970adb0e7a 100644 --- a/code/game/machinery/vending/soda.dm +++ b/code/game/machinery/vending/soda.dm @@ -130,7 +130,7 @@ /obj/item/reagent_containers/food/drinks/bottle/space_up = 2 ) -/obj/item/device/vending_refill/cola +/obj/item/vending_refill/cola name = "cola resupply canister" vend_id = "cola" charges = 50 @@ -195,7 +195,7 @@ /obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 1 ) -/obj/item/device/vending_refill/zora +/obj/item/vending_refill/zora name = "Zo'ra Soda resupply canister" vend_id = "zora" charges = 40 diff --git a/code/game/objects/auras/personal_shield.dm b/code/game/objects/auras/personal_shield.dm index 9da6d165a4d..e2de1d277a2 100644 --- a/code/game/objects/auras/personal_shield.dm +++ b/code/game/objects/auras/personal_shield.dm @@ -31,7 +31,7 @@ ..() /obj/aura/personal_shield/device - var/obj/item/device/personal_shield/shield + var/obj/item/personal_shield/shield /obj/aura/personal_shield/device/bullet_act() . = ..() diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 4cd9495a6c4..0613429e4c7 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -23,7 +23,7 @@ icon = 'icons/mob/screen/generic.dmi' icon_state = "x" - var/assembly_type = /obj/item/device/assembly/signaler + var/assembly_type = /obj/item/assembly/signaler //Note that the maximum amount of gas you can put in a 70L air tank at 1013.25 kPa and 519K is 16.44 mol. var/phoron_amt = 10.96 @@ -32,7 +32,7 @@ /obj/effect/spawner/newbomb/timer name = "TTV bomb - timer" - assembly_type = /obj/item/device/assembly/timer + assembly_type = /obj/item/assembly/timer /obj/effect/spawner/newbomb/timer/syndicate name = "TTV bomb - merc" @@ -42,7 +42,7 @@ /obj/effect/spawner/newbomb/proximity name = "TTV bomb - proximity" - assembly_type = /obj/item/device/assembly/prox_sensor + assembly_type = /obj/item/assembly/prox_sensor /obj/effect/spawner/newbomb/radio/custom/Initialize(mapload, ph, ox, co) if(ph != null) phoron_amt = ph @@ -53,7 +53,7 @@ /obj/effect/spawner/newbomb/Initialize() . = ..() - var/obj/item/device/transfer_valve/V = new(src.loc) + var/obj/item/transfer_valve/V = new(src.loc) var/obj/item/tank/phoron/PT = new(V) var/obj/item/tank/oxygen/OT = new(V) @@ -72,7 +72,7 @@ OT.air_contents.gas[GAS_OXYGEN] = oxygen_amt OT.air_contents.update_values() - var/obj/item/device/assembly/S = new assembly_type(V) + var/obj/item/assembly/S = new assembly_type(V) V.attached_device = S diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 778d0c99a92..7d21ebb7b6d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -132,7 +132,7 @@ var/list/allowed = null /// All items can have an uplink hidden inside, just remember to add the triggers. - var/obj/item/device/uplink/hidden/hidden_uplink + var/obj/item/uplink/hidden/hidden_uplink /// Name used for message when binoculars/scope is used var/zoomdevicename diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index f7cac470ecc..40b5049fbd7 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -1,4 +1,4 @@ -/obj/item/radio/integrated +/obj/item/integrated_signaler name = "\improper PDA radio module" desc = "An electronic radio system." icon = 'icons/obj/module.dmi' @@ -8,16 +8,16 @@ var/on = 0 //Are we currently active?? var/menu_message = "" -/obj/item/radio/integrated/Initialize() +/obj/item/integrated_signaler/Initialize() . = ..() if (istype(loc.loc, /obj/item/modular_computer)) hostpda = loc.loc -/obj/item/radio/integrated/Destroy() +/obj/item/integrated_signaler/Destroy() hostpda = null return ..() -/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter) +/obj/item/integrated_signaler/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter) var/datum/radio_frequency/frequency = SSradio.return_frequency(freq) if(!frequency) return @@ -40,13 +40,13 @@ */ -/obj/item/radio/integrated/signal +/obj/item/integrated_signaler/signal var/frequency = 1457 var/code = 30.0 var/last_transmission var/datum/radio_frequency/radio_connection -/obj/item/radio/integrated/signal/Initialize() +/obj/item/integrated_signaler/signal/Initialize() . = ..() if(!SSradio) return @@ -56,12 +56,12 @@ set_frequency(frequency) -/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency) +/obj/item/integrated_signaler/signal/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, frequency) -/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE") +/obj/item/integrated_signaler/signal/proc/send_signal(message="ACTIVATE") if(last_transmission && world.time < (last_transmission + 5)) return last_transmission = world.time @@ -77,6 +77,6 @@ radio_connection.post_signal(src, signal) -/obj/item/radio/integrated/signal/Destroy() +/obj/item/integrated_signaler/signal/Destroy() SSradio.remove_object(src, frequency) return ..() diff --git a/code/game/objects/items/devices/augment_implanter.dm b/code/game/objects/items/devices/augment_implanter.dm index 8d50b27e2bd..783b6fbb87d 100644 --- a/code/game/objects/items/devices/augment_implanter.dm +++ b/code/game/objects/items/devices/augment_implanter.dm @@ -1,4 +1,4 @@ -/obj/item/device/augment_implanter +/obj/item/augment_implanter name = "augment implanter" desc = "A complex single use injector that is used to implant augments without the need for surgery." w_class = WEIGHT_CLASS_NORMAL @@ -9,19 +9,19 @@ var/obj/item/organ/augment_type var/new_augment -/obj/item/device/augment_implanter/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/augment_implanter/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(augment_type) . += SPAN_NOTICE("\The [augment_type] can be seen floating inside \the [src]'s biogel.") else . += SPAN_WARNING("It is spent.") -/obj/item/device/augment_implanter/Initialize() +/obj/item/augment_implanter/Initialize() . = ..() if(!augment_type) augment_type = new new_augment(src) -/obj/item/device/augment_implanter/afterattack(mob/living/L, mob/user, proximity) +/obj/item/augment_implanter/afterattack(mob/living/L, mob/user, proximity) if(!proximity) return @@ -56,41 +56,41 @@ user.visible_message(SPAN_WARNING("\The [user] thrusts \the [src] deep into \the [H], injecting something!")) -/obj/item/device/augment_implanter/advanced_tesla +/obj/item/augment_implanter/advanced_tesla new_augment = /obj/item/organ/internal/augment/tesla/advanced -/obj/item/device/augment_implanter/advanced_suspension +/obj/item/augment_implanter/advanced_suspension new_augment = /obj/item/organ/internal/augment/suspension/advanced -/obj/item/device/augment_implanter/combitool +/obj/item/augment_implanter/combitool new_augment = /obj/item/organ/internal/augment/tool/combitool -/obj/item/device/augment_implanter/health_scanner +/obj/item/augment_implanter/health_scanner new_augment = /obj/item/organ/internal/augment/health_scanner -/obj/item/device/augment_implanter/hivenet_shield +/obj/item/augment_implanter/hivenet_shield new_augment = /obj/item/organ/internal/augment/hiveshield -/obj/item/device/augment_implanter/hivenet_advanced_shield +/obj/item/augment_implanter/hivenet_advanced_shield new_augment = /obj/item/organ/internal/augment/hiveshield/advanced -/obj/item/device/augment_implanter/hivenet_warfare +/obj/item/augment_implanter/hivenet_warfare new_augment = /obj/item/organ/internal/augment/hiveshield/warfare -/obj/item/device/augment_implanter/auxiliary_heart +/obj/item/augment_implanter/auxiliary_heart new_augment = /obj/item/organ/internal/augment/bioaug/auxiliary_heart -/obj/item/device/augment_implanter/gravity_adaptations +/obj/item/augment_implanter/gravity_adaptations new_augment = /obj/item/organ/internal/augment/bioaug/gravity_adaptations -/obj/item/device/augment_implanter/mind_blanker +/obj/item/augment_implanter/mind_blanker new_augment = /obj/item/organ/internal/augment/bioaug/mind_blanker -/obj/item/device/augment_implanter/mind_blanker_lethal +/obj/item/augment_implanter/mind_blanker_lethal new_augment = /obj/item/organ/internal/augment/bioaug/mind_blanker_lethal -/obj/item/device/augment_implanter/platelet_factories +/obj/item/augment_implanter/platelet_factories new_augment = /obj/item/organ/internal/augment/bioaug/platelet_factories -/obj/item/device/augment_implanter/subdermal_carapace +/obj/item/augment_implanter/subdermal_carapace new_augment = /obj/item/organ/internal/augment/bioaug/subdermal_carapace diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index cc3295982a6..350744b71c5 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -1,8 +1,8 @@ -/obj/item/device/binoculars +/obj/item/binoculars name = "binoculars" desc = "A pair of binoculars." - icon = 'icons/obj/item/device/binoculars.dmi' + icon = 'icons/obj/item/binoculars.dmi' icon_state = "binoculars" item_state = "binoculars" action_button_name = "Toggle Binoculars" @@ -16,12 +16,12 @@ var/tileoffset = 7 var/viewsize = 7 -/obj/item/device/binoculars/attack_self(mob/user) +/obj/item/binoculars/attack_self(mob/user) if(do_after(user, 1.5 SECONDS)) user.visible_message(SPAN_NOTICE("[user] looks into the binoculars."), SPAN_NOTICE("You look through the binoculars.")) zoom(user, tileoffset, viewsize, show_zoom_message = FALSE) -/obj/item/device/binoculars/high_power +/obj/item/binoculars/high_power name = "high power binoculars" desc = "A pair of high power binoculars." icon_state = "binoculars_high" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index c9538c5d402..7286485f82e 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,7 +1,7 @@ -/obj/item/device/chameleon +/obj/item/chameleon name = "chameleon projector" desc = "A strange device." - icon = 'icons/obj/item/device/chameleon.dmi' + icon = 'icons/obj/item/chameleon.dmi' icon_state = "shield0" item_state = "electronic" obj_flags = OBJ_FLAG_CONDUCTABLE @@ -18,24 +18,24 @@ var/saved_icon_state = "cigbutt" var/saved_overlays -/obj/item/device/chameleon/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/chameleon/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "This device can let you disguise as common objects." . += "Left-click on an object with this in your active hand to scan it." . += "Left-click it in-hand to toggle the effect." -/obj/item/device/chameleon/dropped() +/obj/item/chameleon/dropped() disrupt() ..() -/obj/item/device/chameleon/equipped() +/obj/item/chameleon/equipped() disrupt() ..() -/obj/item/device/chameleon/attack_self() +/obj/item/chameleon/attack_self() toggle() -/obj/item/device/chameleon/afterattack(atom/target, mob/user , proximity) +/obj/item/chameleon/afterattack(atom/target, mob/user , proximity) if(!proximity) return if(!active_dummy) @@ -47,7 +47,7 @@ saved_icon_state = target.icon_state saved_overlays = target.overlays -/obj/item/device/chameleon/proc/toggle() +/obj/item/chameleon/proc/toggle() if(!can_use || !saved_item) return if(active_dummy) @@ -74,7 +74,7 @@ flick("emppulse",T) QDEL_IN(T, 8) -/obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1) +/obj/item/chameleon/proc/disrupt(var/delete_dummy = 1) if(active_dummy) spark(src, 5) eject_all() @@ -84,7 +84,7 @@ can_use = 0 spawn(50) can_use = 1 -/obj/item/device/chameleon/proc/eject_all() +/obj/item/chameleon/proc/eject_all() for(var/atom/movable/A in active_dummy) A.forceMove(active_dummy.loc) if(ismob(A)) @@ -98,9 +98,9 @@ anchored = TRUE mouse_opacity = MOUSE_OPACITY_ICON var/can_move = TRUE - var/obj/item/device/chameleon/master = null + var/obj/item/chameleon/master = null -/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, var/obj/item/device/chameleon/C) +/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, var/obj/item/chameleon/C) name = O.name desc = O.desc icon = new_icon diff --git a/code/game/objects/items/devices/clothes_dyer.dm b/code/game/objects/items/devices/clothes_dyer.dm index e03db03934c..cf895e3e145 100644 --- a/code/game/objects/items/devices/clothes_dyer.dm +++ b/code/game/objects/items/devices/clothes_dyer.dm @@ -2,10 +2,10 @@ #define ACCENT_COLOR "Accent Color" // Only works for clothes that are already recolorable. -/obj/item/device/clothes_dyer +/obj/item/clothes_dyer name = "clothes dyer" desc = "This is a device designed to rapidly dye clothes to new colors. Naysayers say it isn't great for the fabric, but what do they know?" - icon = 'icons/obj/item/device/paint_sprayer.dmi' + icon = 'icons/obj/item/paint_sprayer.dmi' icon_state = "paint_sprayer" item_state = "paint_sprayer" /// Controls whether the dyer changes the primary or accent color of the clothes item. @@ -13,12 +13,12 @@ /// Contains the colors the dyer is set to for each possible mode. var/list/colors_by_mode = list(BASE_COLOR = "#FFFFFF", ACCENT_COLOR = "#FFFFFF") -/obj/item/device/clothes_dyer/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/clothes_dyer/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Select the desired color by using the item on yourself, and alternate between the primary and secondary colour of the item by alt-clicking the item. This only works on clothing items that are recolorable." // Changes the color of the selected mode. -/obj/item/device/clothes_dyer/attack_self(mob/user) +/obj/item/clothes_dyer/attack_self(mob/user) var/selected_color = input(user, "Please select dye color.", "Dye Color", colors_by_mode[selected_mode]) as color|null if (!selected_color) return @@ -27,7 +27,7 @@ to_chat(user, SPAN_NOTICE("You adjust the color of [selected_mode].")) // Switches the mode. -/obj/item/device/clothes_dyer/AltClick(mob/user) +/obj/item/clothes_dyer/AltClick(mob/user) if (!Adjacent(user)) return @@ -39,7 +39,7 @@ to_chat(user, SPAN_NOTICE("You adjust the mode of the clothes dyer to [new_selected_mode].")) // Changes the color on clothing. -/obj/item/device/clothes_dyer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) +/obj/item/clothes_dyer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) if (!proximity_flag) return diff --git a/code/game/objects/items/devices/cosmetic_surgery_kit.dm b/code/game/objects/items/devices/cosmetic_surgery_kit.dm index 54a9633a63c..01c813a9664 100644 --- a/code/game/objects/items/devices/cosmetic_surgery_kit.dm +++ b/code/game/objects/items/devices/cosmetic_surgery_kit.dm @@ -1,4 +1,4 @@ -/obj/item/device/cosmetic_surgery_kit +/obj/item/cosmetic_surgery_kit name = "cosmetic surgery auto-kit" icon = 'icons/obj/item/autoimplanter.dmi' icon_state = "autoimplanter" @@ -17,7 +17,7 @@ var/used = FALSE -/obj/item/device/cosmetic_surgery_kit/attack_self(mob/living/carbon/human/user) +/obj/item/cosmetic_surgery_kit/attack_self(mob/living/carbon/human/user) if(used) to_chat(user, SPAN_WARNING("\The [src] remains lifeless, as its armatures dangle uselessly, now.")) return diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 022d30524fe..aaa60891156 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -1,5 +1,5 @@ // Used to resolve throwing vendors without going directly into wiring. -/obj/item/device/debugger +/obj/item/debugger name = "debugger" desc = "Used to debug electronic equipment, debuggers come with a retractable data cable that can be plugged into most machines." icon = 'icons/obj/hacktool.dmi' @@ -15,6 +15,6 @@ matter = list(MATERIAL_PLASTIC = 50, DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20) origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) -/obj/item/device/debugger/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/debugger/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "The debugger can be used on vending machines and APCs to identify and resolve any viral infections." diff --git a/code/game/objects/items/devices/dociler.dm b/code/game/objects/items/devices/dociler.dm index 67955c79d88..80bf841640a 100644 --- a/code/game/objects/items/devices/dociler.dm +++ b/code/game/objects/items/devices/dociler.dm @@ -1,4 +1,4 @@ -/obj/item/device/dociler +/obj/item/dociler name = "dociler" desc = "A complex single use recharging injector that spreads a complex neurological serum that makes animals docile and friendly. Somewhat." w_class = WEIGHT_CLASS_NORMAL @@ -10,11 +10,11 @@ var/loaded = 1 var/mode = "completely" -/obj/item/device/dociler/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/dociler/feedback_hints(mob/user, distance, is_adjacent) . += ..() . += SPAN_NOTICE("It is currently set to [mode] docile mode.") -/obj/item/device/dociler/attack_self(var/mob/user) +/obj/item/dociler/attack_self(var/mob/user) if(mode == "somewhat") mode = "completely" else @@ -22,7 +22,7 @@ to_chat(user, "You set \the [src] to [mode] docile mode.") -/obj/item/device/dociler/afterattack(var/mob/living/L, var/mob/user, proximity) +/obj/item/dociler/afterattack(var/mob/living/L, var/mob/user, proximity) if(!proximity) return if(!istype(L, /mob/living/simple_animal)) @@ -61,7 +61,7 @@ addtimer(CALLBACK(src, PROC_REF(do_recharge)), 5 MINUTES) -/obj/item/device/dociler/proc/do_recharge() +/obj/item/dociler/proc/do_recharge() loaded = 1 icon_state = "decloner" src.visible_message("\The [src] beeps, refilling itself.") diff --git a/code/game/objects/items/devices/drop_targeter/_droptargeter.dm b/code/game/objects/items/devices/drop_targeter/_droptargeter.dm index 99f9f4b9545..922e5cfc940 100644 --- a/code/game/objects/items/devices/drop_targeter/_droptargeter.dm +++ b/code/game/objects/items/devices/drop_targeter/_droptargeter.dm @@ -1,7 +1,7 @@ -/obj/item/device/orbital_dropper +/obj/item/orbital_dropper name = "laser targeting dropper" desc = "A device used to paint a target, which will then promptly orbitally drop the requested items." - icon = 'icons/obj/item/device/binoculars.dmi' + icon = 'icons/obj/item/binoculars.dmi' icon_state = "binoculars" item_state = "binoculars" slot_flags = SLOT_BELT @@ -25,18 +25,18 @@ var/datum/map_template/map -/obj/item/device/orbital_dropper/attack_self(mob/user) +/obj/item/orbital_dropper/attack_self(mob/user) zoom(user, tileoffset, viewsize) -/obj/item/device/orbital_dropper/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/orbital_dropper/attack(mob/living/target_mob, mob/living/user, target_zone) laser_act(target_mob, user) -/obj/item/device/orbital_dropper/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/orbital_dropper/afterattack(var/atom/target, var/mob/living/user, flag, params) if(flag) //we're placing the targetter on a table or in backpack return laser_act(target, user) -/obj/item/device/orbital_dropper/proc/laser_act(var/atom/target, var/mob/living/user) +/obj/item/orbital_dropper/proc/laser_act(var/atom/target, var/mob/living/user) if(has_dropped >= drop_amount) to_chat(user, SPAN_WARNING("You can't use this device again!")) return @@ -93,14 +93,14 @@ flick_overlay(I, showto, 20) //2 seconds of the red dot appearing icon_state = "binoculars" -/obj/item/device/orbital_dropper/proc/orbital_drop(var/turf/target, var/user) +/obj/item/orbital_dropper/proc/orbital_drop(var/turf/target, var/user) if(!map) return log_and_message_admins("[key_name_admin(user)] has used a [src] at JMP.") map.load(target, TRUE) //Target must be the center! -/obj/item/device/orbital_dropper/emag_act(var/remaining_charges, var/mob/user) +/obj/item/orbital_dropper/emag_act(var/remaining_charges, var/mob/user) if(!emagged) emagged = TRUE to_chat(user, SPAN_DANGER("You override \the [src]'s area safety checks!")) diff --git a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm index 75c3025f5da..b1847a43fcf 100644 --- a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm +++ b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm @@ -1,4 +1,4 @@ -/obj/item/device/orbital_dropper/drill +/obj/item/orbital_dropper/drill name = "drill dropper" desc = "A device used to paint a target, which will then promptly orbitally drop the requested items. This drill literally pierces the heavens." @@ -7,7 +7,7 @@ map = new /datum/map_template/drill -/obj/item/device/orbital_dropper/minecart +/obj/item/orbital_dropper/minecart name = "minecart train dropper" desc = "A device used to paint a target, which will then promptly orbitally drop the requested items. This one is configured to deliver an exoplanet-ready minecart train. Rails not included." @@ -17,7 +17,7 @@ drop_amount = 1 map = new /datum/map_template/minecart -/obj/item/device/orbital_dropper/mecha +/obj/item/orbital_dropper/mecha name = "mecha dropper" desc = "A device used to paint a target, which will then promptly orbitally drop the requested items. This one feels vaguely familiar..." @@ -30,19 +30,19 @@ map = new /datum/map_template/mecha -/obj/item/device/orbital_dropper/mecha/heavy +/obj/item/orbital_dropper/mecha/heavy map = new /datum/map_template/mecha/heavy -/obj/item/device/orbital_dropper/mecha/combat +/obj/item/orbital_dropper/mecha/combat map = new /datum/map_template/mecha/combat -/obj/item/device/orbital_dropper/mecha/powerloader +/obj/item/orbital_dropper/mecha/powerloader map = new /datum/map_template/mecha/powerloader -/obj/item/device/orbital_dropper/mecha/miner +/obj/item/orbital_dropper/mecha/miner map = new /datum/map_template/mecha/miner -/obj/item/device/orbital_dropper/armory +/obj/item/orbital_dropper/armory name = "armory dropper" desc = "A device used to paint a target, which will then promptly orbitally drop the requested items. Who's ready to raise hell?" @@ -55,15 +55,15 @@ map = new /datum/map_template/armory -/obj/item/device/orbital_dropper/armory/syndicate +/obj/item/orbital_dropper/armory/syndicate announcer_name = "Tactical Autodrone" announcer_frequency = SYND_FREQ -/obj/item/device/orbital_dropper/armory/syndicate/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/orbital_dropper/armory/syndicate/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "This is a stealthy variant of the standard armory orbital drop. It will not report itself dropping on Common, unless emagged." -/obj/item/device/orbital_dropper/icarus_drones +/obj/item/orbital_dropper/icarus_drones name = "icarus painter" desc = "A device used to paint a target, which will then promptly orbitally drop the requested items. This one has been modified to call in Icarus Drones." @@ -78,7 +78,7 @@ map = null -/obj/item/device/orbital_dropper/icarus_drones/orbital_drop(var/turf/target, var/user) +/obj/item/orbital_dropper/icarus_drones/orbital_drop(var/turf/target, var/user) log_and_message_admins("[key_name_admin(user)] has used a [src] at JMP.") for(var/i = 1, i <= num_of_drones, i++) new /mob/living/simple_animal/hostile/icarus_drone(get_random_turf_in_range(target, 4, 2, TRUE)) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index a0caf8bd0e0..531929210a5 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,7 +1,7 @@ -/obj/item/device/flash +/obj/item/flash name = "flash" desc = "A security device capable of producing a blinding, incapacitating flash at close ranges. Repeated use may result in a burnt-out bulb and/or excessive force investigations." - icon = 'icons/obj/item/device/flash.dmi' + icon = 'icons/obj/item/flash.dmi' icon_state = "flash" item_state = "flash" throwforce = 5 @@ -17,12 +17,12 @@ var/last_use = 0 -/obj/item/device/flash/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/flash/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Click on someone adjacent to you to attempt to blind them." . += "Use it in your hand with HARM intent, or on yourself, to blind everyone in a small radius (including yourself!)" -/obj/item/device/flash/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/flash/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(!broken) var/num_charges = max(0, max_charges - times_used) @@ -30,20 +30,20 @@ else . += SPAN_ALERT("\The [src]'s bulb is burnt out!") -/obj/item/device/flash/proc/clumsy_check(mob/user) +/obj/item/flash/proc/clumsy_check(mob/user) if(user && (user.is_clumsy()) && prob(50)) to_chat(user, SPAN_WARNING("\The [src] slips out of your hand.")) user.drop_from_inventory(src) return FALSE return TRUE -/obj/item/device/flash/proc/cooldown() +/obj/item/flash/proc/cooldown() if(broken || times_used >= max_charges) return TRUE return world.time > (last_use + 1 SECOND) -/obj/item/device/flash/proc/burnout_check(mob/user, intensity = 1) +/obj/item/flash/proc/burnout_check(mob/user, intensity = 1) if(times_used >= max_charges) to_chat(user, SPAN_WARNING("*click* *click*")) return TRUE @@ -52,16 +52,16 @@ burnout(user) else times_used++ - addtimer(CALLBACK(src, /obj/item/device/flash/proc/flash_recharge), 30 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE) + addtimer(CALLBACK(src, /obj/item/flash/proc/flash_recharge), 30 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE) -/obj/item/device/flash/proc/burnout(mob/user) +/obj/item/flash/proc/burnout(mob/user) broken = TRUE icon_state = "flashburnt" name = "burnt-out [initial(name)]" to_chat(user, SPAN_WARNING("The bulb has burnt out!")) spark(get_turf(src)) -/obj/item/device/flash/proc/flash(mob/living/L, _intensity = FLASH_PROTECTION_MAJOR) +/obj/item/flash/proc/flash(mob/living/L, _intensity = FLASH_PROTECTION_MAJOR) last_use = world.time if(L.flash_act(intensity = _intensity, affect_silicon = TRUE, ignore_inherent = TRUE)) @@ -72,14 +72,14 @@ return TRUE -/obj/item/device/flash/proc/flash_recharge() +/obj/item/flash/proc/flash_recharge() if(broken) return times_used = max(0, times_used - 1) if(times_used > 0) - addtimer(CALLBACK(src, /obj/item/device/flash/proc/flash_recharge), 30 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE) + addtimer(CALLBACK(src, /obj/item/flash/proc/flash_recharge), 30 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE) -/obj/item/device/flash/proc/robot_flash(mob/user) +/obj/item/flash/proc/robot_flash(mob/user) if(!isrobot(user)) return @@ -92,7 +92,7 @@ QDEL_IN(animation, 5) //attack_as_weapon -/obj/item/device/flash/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/flash/attack(mob/living/target_mob, mob/living/user, target_zone) // Single-target flash if(!target_mob || !user || !clumsy_check(user) || !cooldown()) return @@ -128,7 +128,7 @@ else user.visible_message(SPAN_NOTICE("[user] fails to blind [target_mob] with \the [src].")) -/obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) +/obj/item/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) // AOE flash if(!user || !clumsy_check(user)|| !cooldown()) return @@ -156,7 +156,7 @@ if(flash(L, _intensity = dist_intensity) && prob(50)) L.disable_cloaking_device() -/obj/item/device/flash/emp_act(severity) +/obj/item/flash/emp_act(severity) . = ..() var/mob/living/L = loc @@ -165,7 +165,7 @@ to_chat(L, SPAN_WARNING("Your [src] goes off!")) flash(L) -/obj/item/device/flash/synthetic +/obj/item/flash/synthetic name = "synthetic flash" desc = "A cheap, mass-produced copy of the handheld flash. The bulb inside is probably only good for one use." icon_state = "sflash" @@ -173,7 +173,7 @@ max_charges = 1 -/obj/item/device/flash/synthetic/burnout_check(mob/user, intensity = 1) +/obj/item/flash/synthetic/burnout_check(mob/user, intensity = 1) . = broken // Single-use if(!broken) burnout(user) diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 738e6c49afa..4e50630ab7b 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -1,4 +1,4 @@ -/obj/item/device/geiger +/obj/item/geiger name = "geiger counter" desc = "A handheld device used for detecting and measuring radiation in an area." icon = 'icons/obj/geiger_counter.dmi' @@ -14,7 +14,7 @@ var/geiger_volume = 0 var/sound_id -/obj/item/device/geiger/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/geiger/feedback_hints(mob/user, distance, is_adjacent) . += ..() var/msg = "[scanning ? "ambient" : "stored"] Radiation level: [radiation_count ? radiation_count : "0"] IU/s." if(radiation_count > RAD_LEVEL_LOW) @@ -22,28 +22,28 @@ else . += SPAN_NOTICE("[msg]") -/obj/item/device/geiger/Initialize() +/obj/item/geiger/Initialize() . = ..() sound_id = "[type]_[sequential_id(type)]" -/obj/item/device/geiger/proc/update_sound(playing) +/obj/item/geiger/proc/update_sound(playing) if(playing && !sound_token) sound_token = GLOB.sound_player.PlayLoopingSound(src, sound_id, 'sound/items/geiger.ogg', volume = geiger_volume, range = 4, falloff = 3, prefer_mute = TRUE) else if(!playing && sound_token) QDEL_NULL(sound_token) -/obj/item/device/geiger/Destroy() +/obj/item/geiger/Destroy() . = ..() STOP_PROCESSING(SSprocessing, src) update_sound(0) -/obj/item/device/geiger/process() +/obj/item/geiger/process() if(!scanning) return radiation_count = SSradiation.get_rads_at_turf(get_turf(src)) update_icon() -/obj/item/device/geiger/attack_self(mob/user) +/obj/item/geiger/attack_self(mob/user) scanning = !scanning if(scanning) START_PROCESSING(SSprocessing, src) @@ -52,7 +52,7 @@ update_icon() to_chat(user, SPAN_NOTICE("[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].")) -/obj/item/device/geiger/update_icon() +/obj/item/geiger/update_icon() if(!scanning) icon_state = "geiger_off" update_sound(0) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index 56fa133ed6e..33dbaa3bd56 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -1,4 +1,4 @@ -/obj/item/device/multitool/hacktool +/obj/item/multitool/hacktool var/is_hacking = 0 var/in_hack_mode = 0 @@ -13,14 +13,14 @@ var/multihack = FALSE var/allow_movement = FALSE -/obj/item/device/multitool/hacktool/New() +/obj/item/multitool/hacktool/New() ..() known_targets = list() current_hacks = list() supported_types = list(/obj/machinery/door/airlock) hack_state = new(src) -/obj/item/device/multitool/hacktool/Destroy() +/obj/item/multitool/hacktool/Destroy() for(var/T in known_targets) var/atom/target = T UnregisterSignal(target, COMSIG_QDELETING) @@ -29,7 +29,7 @@ hack_state = null return ..() -/obj/item/device/multitool/hacktool/attackby(obj/item/attacking_item, mob/user) +/obj/item/multitool/hacktool/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) in_hack_mode = !in_hack_mode playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, TRUE) @@ -37,7 +37,7 @@ else return ..() -/obj/item/device/multitool/hacktool/resolve_attackby(atom/A, mob/user) +/obj/item/multitool/hacktool/resolve_attackby(atom/A, mob/user) sanity_check() if(!in_hack_mode || istype(A, /obj/item/storage)) @@ -50,7 +50,7 @@ A.ui_interact(user) return TRUE -/obj/item/device/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target) +/obj/item/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target) if(is_hacking && !multihack) to_chat(user, SPAN_WARNING("You are already hacking!")) return FALSE @@ -91,7 +91,7 @@ RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_destroy)) return TRUE -/obj/item/device/multitool/hacktool/proc/sanity_check() +/obj/item/multitool/hacktool/proc/sanity_check() if(max_known_targets < 1) max_known_targets = 1 // Cut away the oldest items if the capacity has been reached @@ -101,10 +101,10 @@ UnregisterSignal(A, COMSIG_QDELETING) known_targets.Cut(max_known_targets + 1) -/obj/item/device/multitool/hacktool/proc/on_target_destroy(var/target) +/obj/item/multitool/hacktool/proc/on_target_destroy(var/target) known_targets -= target -/obj/item/device/multitool/hacktool/rig //For ninjas; Credits to BurgerBB +/obj/item/multitool/hacktool/rig //For ninjas; Credits to BurgerBB hack_time = 5 SECONDS max_known_targets = 10 in_hack_mode = TRUE @@ -114,15 +114,15 @@ reach = 8 var/mob/living/creator -/obj/item/device/multitool/hacktool/rig/Initialize() +/obj/item/multitool/hacktool/rig/Initialize() . = ..() START_PROCESSING(SSprocessing, src) -/obj/item/device/multitool/hacktool/rig/Destroy() +/obj/item/multitool/hacktool/rig/Destroy() STOP_PROCESSING(SSprocessing, src) return ..() -/obj/item/device/multitool/hacktool/rig/process() +/obj/item/multitool/hacktool/rig/process() if(!creator || loc != creator || (creator.l_hand != src && creator.r_hand != src)) // Tidy up a bit. if(istype(loc,/mob/living)) @@ -138,7 +138,7 @@ QDEL_IN(src, 1) /datum/ui_state/default/must_hack - var/obj/item/device/multitool/hacktool/hacktool + var/obj/item/multitool/hacktool/hacktool /datum/ui_state/default/must_hack/New(var/hacktool) src.hacktool = hacktool diff --git a/code/game/objects/items/devices/hearing_aid.dm b/code/game/objects/items/devices/hearing_aid.dm index c94a656220b..64bfe7316ca 100644 --- a/code/game/objects/items/devices/hearing_aid.dm +++ b/code/game/objects/items/devices/hearing_aid.dm @@ -1,28 +1,28 @@ -/obj/item/device/hearing_aid +/obj/item/hearing_aid name = "grey hearing aid" desc = "A device that allows the naturally deaf to hear, to an extent." - icon = 'icons/obj/item/device/hearing_aid.dmi' + icon = 'icons/obj/item/hearing_aid.dmi' icon_state = "hearing_aid" item_state = "hearing_aid" slot_flags = SLOT_EARS w_class = WEIGHT_CLASS_SMALL -/obj/item/device/hearing_aid/black +/obj/item/hearing_aid/black name = "black hearing aid" icon_state = "hearing_aid-b" item_state = "hearing_aid-b" -/obj/item/device/hearing_aid/silver +/obj/item/hearing_aid/silver name = "silver hearing aid" icon_state = "hearing_aid-s" item_state = "hearing_aid-s" -/obj/item/device/hearing_aid/white +/obj/item/hearing_aid/white name = "white hearing aid" icon_state = "hearing_aid-w" item_state = "hearing_aid-w" -/obj/item/device/hearing_aid/skrell +/obj/item/hearing_aid/skrell name = "skrellian hearing aid" desc = "A device that allows the naturally deaf to hear, to an extent. It seems to be Skrellian in design." icon_state = "hearing_aid_skrell" @@ -32,20 +32,20 @@ name = "hearing aid case" desc = "A small plastic case designed to hold a pair of hearing aids." w_class = WEIGHT_CLASS_SMALL - can_hold = list(/obj/item/device/hearing_aid) - icon = 'icons/obj/item/device/hearing_aid.dmi' + can_hold = list(/obj/item/hearing_aid) + icon = 'icons/obj/item/hearing_aid.dmi' icon_state = "hearing_aid_case" storage_slots = 2 - starts_with = list(/obj/item/device/hearing_aid = 2) + starts_with = list(/obj/item/hearing_aid = 2) /obj/item/storage/hearing_aid_case/black - starts_with = list(/obj/item/device/hearing_aid/black = 2) + starts_with = list(/obj/item/hearing_aid/black = 2) /obj/item/storage/hearing_aid_case/silver - starts_with = list(/obj/item/device/hearing_aid/silver = 2) + starts_with = list(/obj/item/hearing_aid/silver = 2) /obj/item/storage/hearing_aid_case/white - starts_with = list(/obj/item/device/hearing_aid/white = 2) + starts_with = list(/obj/item/hearing_aid/white = 2) /obj/item/storage/hearing_aid_case/skrell - starts_with = list(/obj/item/device/hearing_aid/skrell = 2) + starts_with = list(/obj/item/hearing_aid/skrell = 2) diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index 5decc12ab24..e2c65324beb 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -1,4 +1,4 @@ -/obj/item/device/holowarrant +/obj/item/holowarrant name = "warrant projector" desc = "The practical paperwork replacement for the officer on the go." icon = 'icons/obj/holowarrant.dmi' @@ -12,25 +12,25 @@ var/datum/record/warrant/selected_warrant -/obj/item/device/holowarrant/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/holowarrant/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Use this item in-hand to select the active warrant." . += "Click on the person you want to show it to to display the warrant to them." -/obj/item/device/holowarrant/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/holowarrant/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(selected_warrant) . += "It's a holographic warrant for '[selected_warrant.name]'." -/obj/item/device/holowarrant/Initialize(mapload, ...) +/obj/item/holowarrant/Initialize(mapload, ...) . = ..() RegisterSignal(SSrecords, COMSIG_RECORD_CREATED, PROC_REF(handle_warrant_created)) -/obj/item/device/holowarrant/Destroy() +/obj/item/holowarrant/Destroy() unload_warrant() return ..() -/obj/item/device/holowarrant/attack_self(mob/living/user as mob) +/obj/item/holowarrant/attack_self(mob/living/user as mob) if(!LAZYLEN(SSrecords.warrants)) to_chat(user, SPAN_NOTICE("There are no warrants available at this time.")) return @@ -52,32 +52,32 @@ play_message(SPAN_NOTICE("\The [src] pings, \"Warrant [selected_warrant ? "" : "un"]loaded.\"")) -/obj/item/device/holowarrant/proc/load_warrant(var/datum/record/warrant/warrant) +/obj/item/holowarrant/proc/load_warrant(var/datum/record/warrant/warrant) selected_warrant = warrant RegisterSignal(selected_warrant, COMSIG_QDELETING, PROC_REF(handle_warrant_delete)) RegisterSignal(selected_warrant, COMSIG_RECORD_MODIFIED, PROC_REF(handle_warrant_modify)) update_icon() -/obj/item/device/holowarrant/proc/unload_warrant() +/obj/item/holowarrant/proc/unload_warrant() if(selected_warrant) UnregisterSignal(selected_warrant, COMSIG_QDELETING) UnregisterSignal(selected_warrant, COMSIG_RECORD_MODIFIED) selected_warrant = null update_icon() -/obj/item/device/holowarrant/proc/play_message(var/message) +/obj/item/holowarrant/proc/play_message(var/message) playsound(get_turf(src), 'sound/machines/ping.ogg', 40) audible_message(message) /// Called when a warrant is created -/obj/item/device/holowarrant/proc/handle_warrant_created(datum/source, datum/record/record) +/obj/item/holowarrant/proc/handle_warrant_created(datum/source, datum/record/record) SIGNAL_HANDLER if(istype(record, /datum/record/warrant)) play_message(SPAN_NOTICE("\The [src] pings, \"New warrant on database.\"")) /// Called right before the warrant is deleted -/obj/item/device/holowarrant/proc/handle_warrant_delete(datum/source) +/obj/item/holowarrant/proc/handle_warrant_delete(datum/source) SIGNAL_HANDLER unload_warrant() @@ -85,12 +85,12 @@ play_message(SPAN_NOTICE("\The [src] pings, \"Active warrant deleted.\"")) /// Called right after the warrant is modified -/obj/item/device/holowarrant/proc/handle_warrant_modify(datum/source) +/obj/item/holowarrant/proc/handle_warrant_modify(datum/source) SIGNAL_HANDLER play_message(SPAN_NOTICE("\The [src] pings, \"Active warrant modified.\"")) -/obj/item/device/holowarrant/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/holowarrant/attack(mob/living/target_mob, mob/living/user, target_zone) if(!selected_warrant) to_chat(user, SPAN_WARNING("There are no warrants loaded!")) return @@ -98,13 +98,13 @@ user.visible_message("[user] holds \the [src] up to \the [target_mob].", SPAN_NOTICE("You hold up \the [src] to \the [target_mob].")) show_content(target_mob) -/obj/item/device/holowarrant/update_icon() +/obj/item/holowarrant/update_icon() if(selected_warrant) icon_state = "holowarrant_filled" else icon_state = "holowarrant" -/obj/item/device/holowarrant/proc/show_content(mob/user) +/obj/item/holowarrant/proc/show_content(mob/user) if(selected_warrant.wtype == "arrest") var/output = {" Arrest Warrant: [selected_warrant.name] diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 211ef54f721..9e3f9744ab0 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -1,9 +1,9 @@ -/obj/item/device/laser_pointer +/obj/item/laser_pointer name = "laser pointer" desc = "Don't shine it in your eyes!" - icon = 'icons/obj/item/device/laser_pointer.dmi' + icon = 'icons/obj/item/laser_pointer.dmi' icon_state = "pointer" item_state = "pen" var/pointer_icon_state @@ -12,34 +12,34 @@ var/turf/pointer_loc var/obj/item/stock_parts/micro_laser/diode //cant use the laser without it -/obj/item/device/laser_pointer/red +/obj/item/laser_pointer/red pointer_icon_state = "red_laser" -/obj/item/device/laser_pointer/green +/obj/item/laser_pointer/green pointer_icon_state = "green_laser" -/obj/item/device/laser_pointer/blue +/obj/item/laser_pointer/blue pointer_icon_state = "blue_laser" -/obj/item/device/laser_pointer/purple +/obj/item/laser_pointer/purple pointer_icon_state = "purple_laser" -/obj/item/device/laser_pointer/Initialize() +/obj/item/laser_pointer/Initialize() . = ..() diode = new(src) icon_state = "pointer" if(!pointer_icon_state) pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser") -/obj/item/device/laser_pointer/upgraded/Initialize() +/obj/item/laser_pointer/upgraded/Initialize() . = ..() diode = new /obj/item/stock_parts/micro_laser/ultra -/obj/item/device/laser_pointer/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/laser_pointer/attack(mob/living/target_mob, mob/living/user, target_zone) laser_act(target_mob, user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) -/obj/item/device/laser_pointer/attackby(obj/item/attacking_item, mob/user) +/obj/item/laser_pointer/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/stock_parts/micro_laser)) if(!diode) user.drop_item() @@ -57,13 +57,13 @@ diode = null return TRUE -/obj/item/device/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) +/obj/item/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params) if(flag) //we're placing the object on a table or in backpack return laser_act(target, user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) -/obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user) +/obj/item/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user) if( !(user in (viewers(7,target))) ) return if (!diode) @@ -123,7 +123,7 @@ flick_overlay(I, showto, 15) icon_state = "pointer" -/obj/item/device/laser_pointer/Destroy() +/obj/item/laser_pointer/Destroy() if (diode) QDEL_NULL(diode) diff --git a/code/game/objects/items/devices/lighting/flare.dm b/code/game/objects/items/devices/lighting/flare.dm index fe31d2f4dd7..e687d3d83d3 100644 --- a/code/game/objects/items/devices/lighting/flare.dm +++ b/code/game/objects/items/devices/lighting/flare.dm @@ -1,4 +1,4 @@ -/obj/item/device/flashlight/flare +/obj/item/flashlight/flare name = "flare" desc = "A red standard-issue flare. There are instructions on the side reading 'twist cap off, make light'." w_class = WEIGHT_CLASS_TINY @@ -17,15 +17,15 @@ drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' -/obj/item/device/flashlight/flare/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/flashlight/flare/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Left-click \the [src] in-hand to activate it." -/obj/item/device/flashlight/flare/Initialize() +/obj/item/flashlight/flare/Initialize() . = ..() fuel = rand(12 MINUTES, 15 MINUTES) -/obj/item/device/flashlight/flare/process() +/obj/item/flashlight/flare/process() if(produce_heat) var/turf/pos = get_turf(src) if(pos) @@ -38,7 +38,7 @@ if(!fuel) src.icon_state = "[initial(icon_state)]-empty" -/obj/item/device/flashlight/flare/update_icon() +/obj/item/flashlight/flare/update_icon() ..() item_state = icon_state if(ismob(src.loc)) @@ -46,7 +46,7 @@ H.update_inv_l_hand() H.update_inv_r_hand() -/obj/item/device/flashlight/flare/attack_self(mob/user) +/obj/item/flashlight/flare/attack_self(mob/user) // Usual checks if(!fuel) to_chat(user, SPAN_WARNING("\The [src] is spent.")) @@ -61,7 +61,7 @@ START_PROCESSING(SSprocessing, src) update_icon() -/obj/item/device/flashlight/flare/proc/activate(mob/user) +/obj/item/flashlight/flare/proc/activate(mob/user) if(istype(user)) user.visible_message( SPAN_NOTICE("\The [user] activates the flare."), @@ -69,7 +69,7 @@ SPAN_NOTICE("You hear a flare sparking to life.") ) -/obj/item/device/flashlight/flare/proc/turn_off() +/obj/item/flashlight/flare/proc/turn_off() on = FALSE visible_message( SPAN_NOTICE("\The [src] sputters out.") @@ -77,7 +77,7 @@ update_icon() set_light_on(on) -/obj/item/device/flashlight/flare/proc/update_damage() +/obj/item/flashlight/flare/proc/update_damage() if(on) force = on_damage damtype = "fire" @@ -85,7 +85,7 @@ force = initial(force) damtype = initial(damtype) -/obj/item/device/flashlight/flare/torch +/obj/item/flashlight/flare/torch name = "torch" desc = "A rustic source of light." w_class = WEIGHT_CLASS_BULKY @@ -100,18 +100,18 @@ drop_sound = 'sound/items/drop/woodweapon.ogg' pickup_sound = 'sound/items/pickup/woodweapon.ogg' -/obj/item/device/flashlight/flare/torch/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/flashlight/flare/torch/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Click on a source of flame with the torch to light it." -/obj/item/device/flashlight/flare/torch/attack_self(mob/user) +/obj/item/flashlight/flare/torch/attack_self(mob/user) if (on) turn_off() update_damage() user.visible_message("[user] extinguishes \the [src].", SPAN_NOTICE("You extinguish \the [src].")) return -/obj/item/device/flashlight/flare/torch/update_icon() +/obj/item/flashlight/flare/torch/update_icon() ..() item_state = icon_state if(ismob(src.loc)) @@ -119,7 +119,7 @@ H.update_inv_l_hand() H.update_inv_r_hand() -/obj/item/device/flashlight/flare/torch/proc/light(mob/user) +/obj/item/flashlight/flare/torch/proc/light(mob/user) user.visible_message(SPAN_NOTICE("\The [user] lights \the [src]."), SPAN_NOTICE("You light \the [src].")) force = on_damage damtype = "fire" @@ -128,16 +128,16 @@ START_PROCESSING(SSprocessing, src) update_icon() -/obj/item/device/flashlight/flare/torch/attackby(obj/item/attacking_item, mob/user) +/obj/item/flashlight/flare/torch/attackby(obj/item/attacking_item, mob/user) if(attacking_item.isFlameSource() && !on && fuel) light(user) else ..() -/obj/item/device/flashlight/flare/torch/isFlameSource() +/obj/item/flashlight/flare/torch/isFlameSource() return on -/obj/item/device/flashlight/flare/torch/process() +/obj/item/flashlight/flare/torch/process() var/turf/pos = get_turf(src) if(pos) pos.hotspot_expose(produce_heat, 5) @@ -167,26 +167,26 @@ /obj/item/torch/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/reagent_containers/glass/rag)) to_chat(user, SPAN_NOTICE("You add \the [attacking_item] to \the [src].")) - var/obj/item/device/flashlight/flare/torch/T = new() + var/obj/item/flashlight/flare/torch/T = new() qdel(attacking_item) user.put_in_hands(T) qdel(src) -/obj/item/device/flashlight/flare/torch/stick +/obj/item/flashlight/flare/torch/stick name = "flaming stick" desc = "How exciting!" light_range = 1.5 light_power = 1 produce_heat = 400 -/obj/item/device/flashlight/flare/torch/stick/Initialize() +/obj/item/flashlight/flare/torch/stick/Initialize() . = ..() fuel = rand(30, 45) on = TRUE START_PROCESSING(SSprocessing, src) update_icon() -/obj/item/device/flashlight/flare/torch/stick/turn_off() +/obj/item/flashlight/flare/torch/stick/turn_off() visible_message("\The [src] burns out.") new /obj/effect/decal/cleanable/ash(get_turf(src)) qdel(src) diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index a9a908542ed..0d9dface53c 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -1,4 +1,4 @@ -/obj/item/device/flashlight +/obj/item/flashlight name = "flashlight" desc = "A hand-held emergency light." icon = 'icons/obj/lighting.dmi' @@ -40,13 +40,13 @@ /// A way for mappers to force which way a flashlight faces upon spawning var/spawn_dir -/obj/item/device/flashlight/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/flashlight/mechanics_hints(mob/user, distance, is_adjacent) . += ..() if(!always_on) . += "Left-click \the [src] in-hand to toggle the light." . += "While held, left-click \the [src] with your free hand to remove the power cell." -/obj/item/device/flashlight/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/flashlight/feedback_hints(mob/user, distance, is_adjacent) . = list() . = ..() if(power_use && brightness_level) @@ -54,7 +54,7 @@ if(cell) . += "\The [src] has \a [cell] attached. It has [round(cell.percent())]% charge remaining." -/obj/item/device/flashlight/Initialize() +/obj/item/flashlight/Initialize() if(power_use && cell_type) if(starts_with_cell) @@ -62,7 +62,7 @@ brightness_levels = list("low" = 2, "medium" = 3, "high" = 4) power_usage = ((brightness_levels[brightness_level]/ 10 ) / efficiency_modifier) else - verbs -= /obj/item/device/flashlight/verb/toggle_brightness + verbs -= /obj/item/flashlight/verb/toggle_brightness if (on) if(brightness_level == "low") @@ -76,15 +76,15 @@ . = ..() -/obj/item/device/flashlight/Destroy() +/obj/item/flashlight/Destroy() STOP_PROCESSING(SSprocessing, src) QDEL_NULL(cell) return ..() -/obj/item/device/flashlight/get_cell() +/obj/item/flashlight/get_cell() return cell -/obj/item/device/flashlight/proc/set_brightness(mob/user) +/obj/item/flashlight/proc/set_brightness(mob/user) var/choice = tgui_input_list(user, "Choose a brightness level.", "Flashlight", brightness_levels) if(choice) set_light_range(brightness_levels[choice]) @@ -92,7 +92,7 @@ to_chat(user, SPAN_NOTICE("You set the brightness level on \the [src] to [brightness_level].")) update_icon() -/obj/item/device/flashlight/process() +/obj/item/flashlight/process() if(!on || !cell) return PROCESS_KILL @@ -105,7 +105,7 @@ toggle() return PROCESS_KILL -/obj/item/device/flashlight/update_icon() +/obj/item/flashlight/update_icon() if(always_on) return @@ -119,7 +119,7 @@ M.update_inv_r_ear() M.update_inv_head() -/obj/item/device/flashlight/attack_self(mob/user) +/obj/item/flashlight/attack_self(mob/user) if(always_on) to_chat(user, SPAN_NOTICE("You cannot toggle \the [name].")) return 0 @@ -139,7 +139,7 @@ user.update_action_buttons() return 1 -/obj/item/device/flashlight/attack_hand(mob/user) +/obj/item/flashlight/attack_hand(mob/user) if(user.get_inactive_hand() == src) if(cell) STOP_PROCESSING(SSprocessing, src) @@ -155,7 +155,7 @@ else return ..() -/obj/item/device/flashlight/attackby(obj/item/attacking_item, mob/user) +/obj/item/flashlight/attackby(obj/item/attacking_item, mob/user) if(power_use) if(istype(attacking_item, /obj/item/cell)) if(istype(attacking_item, /obj/item/cell/device) || accepts_large_cells) @@ -174,7 +174,7 @@ else ..() -/obj/item/device/flashlight/proc/toggle() +/obj/item/flashlight/proc/toggle() on = !on if(on && activation_sound) playsound(src.loc, activation_sound, 75, 1) @@ -185,16 +185,16 @@ set_light_on(on) update_icon() -/obj/item/device/flashlight/vendor_action(var/obj/machinery/vending/V) +/obj/item/flashlight/vendor_action(var/obj/machinery/vending/V) toggle() -/obj/item/device/flashlight/emp_act(severity) +/obj/item/flashlight/emp_act(severity) . = ..() for(var/obj/O in contents) O.emp_act(severity) -/obj/item/device/flashlight/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/flashlight/attack(mob/living/target_mob, mob/living/user, target_zone) add_fingerprint(user) if(on && user.zone_sel.selecting == BP_EYES) @@ -230,10 +230,10 @@ else return ..() -/obj/item/device/flashlight/AltClick() +/obj/item/flashlight/AltClick() toggle_brightness() -/obj/item/device/flashlight/proc/inspect_vision(obj/item/organ/vision, mob/living/user) +/obj/item/flashlight/proc/inspect_vision(obj/item/organ/vision, mob/living/user) var/mob/living/carbon/human/H = vision.owner if (H == user) //can't look into your own eyes buster @@ -263,19 +263,19 @@ else to_chat(user, SPAN_NOTICE("\The [H]'s pupils narrow.")) -/obj/item/device/flashlight/verb/toggle_brightness() +/obj/item/flashlight/verb/toggle_brightness() set name = "Toggle Flashlight Brightness" set category = "Object.Held" set src in usr set_brightness(usr) -/obj/item/device/flashlight/empty +/obj/item/flashlight/empty starts_with_cell = FALSE -/obj/item/device/flashlight/on +/obj/item/flashlight/on on = TRUE -/obj/item/device/flashlight/pen +/obj/item/flashlight/pen name = "penlight" desc = "A pen-sized light, used by medical staff." icon_state = "penlight" @@ -287,7 +287,7 @@ light_range = 2 w_class = WEIGHT_CLASS_TINY -/obj/item/device/flashlight/drone +/obj/item/flashlight/drone name = "low-power flashlight" desc = "A miniature lamp, that might be used by small robots." icon_state = "penlight" @@ -297,7 +297,7 @@ efficiency_modifier = 2 w_class = WEIGHT_CLASS_TINY -/obj/item/device/flashlight/heavy +/obj/item/flashlight/heavy name = "heavy duty flashlight" desc = "A high-luminosity flashlight, for specialist duties." icon_state = "heavyflashlight" @@ -306,10 +306,10 @@ w_class = WEIGHT_CLASS_NORMAL matter = list(MATERIAL_PLASTIC = 100, MATERIAL_GLASS = 70) -/obj/item/device/flashlight/heavy/on +/obj/item/flashlight/heavy/on on = TRUE -/obj/item/device/flashlight/maglight +/obj/item/flashlight/maglight name = "maglight" desc = "A heavy flashlight, designed for security personnel." icon_state = "maglight" @@ -322,17 +322,17 @@ matter = list(MATERIAL_ALUMINIUM = 200, MATERIAL_GLASS = 100) hitsound = 'sound/weapons/smash.ogg' -/obj/item/device/flashlight/maglight/update_icon() +/obj/item/flashlight/maglight/update_icon() ..() if(on) item_state = "maglight-on" else item_state = "maglight" -/obj/item/device/flashlight/maglight/on +/obj/item/flashlight/maglight/on on = TRUE -/obj/item/device/flashlight/slime +/obj/item/flashlight/slime gender = PLURAL name = "glowing slime extract" desc = "A glowing ball of what appears to be amber." @@ -347,7 +347,7 @@ light_color = LIGHT_COLOR_SLIME_LAMP light_system = MOVABLE_LIGHT -/obj/item/device/flashlight/headlights +/obj/item/flashlight/headlights name = "headlights" desc = "Some nifty lamps drawing from internal battery sources to produce a light, though a dim one." icon_state = "headlights" @@ -360,7 +360,7 @@ /******************************Lantern*******************************/ -/obj/item/device/flashlight/lantern +/obj/item/flashlight/lantern name = "lantern" desc = "A mining lantern. Accepts larger cells than normal flashlights." icon_state = "lantern" @@ -374,12 +374,12 @@ light_color = LIGHT_COLOR_FIRE light_system = MOVABLE_LIGHT -/obj/item/device/flashlight/lantern/update_icon() +/obj/item/flashlight/lantern/update_icon() ..() if(on) item_state = "lantern-on" else item_state = "lantern" -/obj/item/device/flashlight/lantern/on +/obj/item/flashlight/lantern/on on = TRUE diff --git a/code/game/objects/items/devices/lighting/glowstick.dm b/code/game/objects/items/devices/lighting/glowstick.dm index 2d721010c46..3864ec02d0b 100644 --- a/code/game/objects/items/devices/lighting/glowstick.dm +++ b/code/game/objects/items/devices/lighting/glowstick.dm @@ -1,4 +1,4 @@ -/obj/item/device/flashlight/flare/glowstick +/obj/item/flashlight/flare/glowstick name = "green glowstick" desc = "A green military-grade glowstick." w_class = WEIGHT_CLASS_SMALL @@ -12,12 +12,12 @@ activation_sound = 'sound/items/glowstick.ogg' toggle_sound = null -/obj/item/device/flashlight/flare/glowstick/Initialize() +/obj/item/flashlight/flare/glowstick/Initialize() . = ..() fuel = rand(9 MINUTES, 12 MINUTES) set_light_color(color) -/obj/item/device/flashlight/flare/glowstick/process() +/obj/item/flashlight/flare/glowstick/process() fuel = max(fuel - 1, 0) if(!fuel || !on) turn_off() @@ -25,7 +25,7 @@ src.icon_state = "[initial(icon_state)]-empty" STOP_PROCESSING(SSprocessing, src) -/obj/item/device/flashlight/flare/glowstick/update_icon() +/obj/item/flashlight/flare/glowstick/update_icon() overlays.Cut() if(!fuel) icon_state = "[initial(icon_state)]-empty" @@ -42,7 +42,7 @@ icon_state = initial(icon_state) update_held_icon() -/obj/item/device/flashlight/flare/glowstick/activate(mob/user) +/obj/item/flashlight/flare/glowstick/activate(mob/user) if(istype(user)) user.visible_message( SPAN_NOTICE("\The [user] cracks and shakes \the [src]."), @@ -50,31 +50,31 @@ SPAN_NOTICE("You hear someone crack and shake a glowstick.") ) -/obj/item/device/flashlight/flare/glowstick/red +/obj/item/flashlight/flare/glowstick/red name = "red glowstick" desc = "A red military-grade glowstick." color = "#FC0F29" -/obj/item/device/flashlight/flare/glowstick/blue +/obj/item/flashlight/flare/glowstick/blue name = "blue glowstick" desc = "A blue military-grade glowstick." color = "#599DFF" -/obj/item/device/flashlight/flare/glowstick/orange +/obj/item/flashlight/flare/glowstick/orange name = "orange glowstick" desc = "A orange military-grade glowstick." color = "#FA7C0B" -/obj/item/device/flashlight/flare/glowstick/yellow +/obj/item/flashlight/flare/glowstick/yellow name = "yellow glowstick" desc = "A yellow military-grade glowstick." color = "#FEF923" -/obj/item/device/flashlight/flare/glowstick/random +/obj/item/flashlight/flare/glowstick/random name = "glowstick" desc = "A party-grade glowstick." color = "#FF00FF" -/obj/item/device/flashlight/flare/glowstick/random/Initialize() +/obj/item/flashlight/flare/glowstick/random/Initialize() color = rgb(rand(50, 255), rand(50, 255), rand(50, 255)) . = ..() diff --git a/code/game/objects/items/devices/lighting/lamp.dm b/code/game/objects/items/devices/lighting/lamp.dm index a6d9f93d811..04ac0b19271 100644 --- a/code/game/objects/items/devices/lighting/lamp.dm +++ b/code/game/objects/items/devices/lighting/lamp.dm @@ -1,4 +1,4 @@ -/obj/item/device/flashlight/lamp +/obj/item/flashlight/lamp name = "desk lamp" desc = "A desk lamp with an adjustable mount." icon_state = "lamp" @@ -15,19 +15,19 @@ light_range = 3 flashlight_power = 1.0 -/obj/item/device/flashlight/lamp/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/flashlight/lamp/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Left-click this item in-hand to toggle the light, or right-click it and use the 'Toggle Light' verb." -/obj/item/device/flashlight/lamp/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/flashlight/lamp/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "As a Cultist, this item can be reforged to become a pylon." -/obj/item/device/flashlight/lamp/off +/obj/item/flashlight/lamp/off on = FALSE // green-shaded desk lamp -/obj/item/device/flashlight/lamp/green +/obj/item/flashlight/lamp/green desc = "A classic green-shaded desk lamp." icon_state = "lampgreen" item_state = "lampgreen" @@ -35,7 +35,7 @@ light_color = "#FFC58F" toggle_sound = 'sound/machines/switch_chain.ogg' -/obj/item/device/flashlight/lamp/verb/toggle_light() +/obj/item/flashlight/lamp/verb/toggle_light() set name = "Toggle Light" set category = "Object" set src in oview(1) @@ -44,7 +44,7 @@ attack_self(usr) //Lava Lamps: Because we're already stuck in the 70ies with those fax machines. -/obj/item/device/flashlight/lamp/lava +/obj/item/flashlight/lamp/lava name = "data encryption lamp" desc = "Random oil globules within were parsed in photos for your protection. Enjoy this kitschy memorabilia by sticking it on your desk." icon_state = "lavalamp" @@ -52,7 +52,7 @@ flashlight_power = 0.5 matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 200) -/obj/item/device/flashlight/lamp/lava/update_icon() +/obj/item/flashlight/lamp/lava/update_icon() if(on) set_light_range_power_color(light_range, flashlight_power, light_color) else @@ -63,37 +63,37 @@ I.color = light_color AddOverlays(I) -/obj/item/device/flashlight/lamp/lava/red +/obj/item/flashlight/lamp/lava/red light_color = COLOR_RED -/obj/item/device/flashlight/lamp/lava/blue +/obj/item/flashlight/lamp/lava/blue light_color = COLOR_BLUE -/obj/item/device/flashlight/lamp/lava/cyan +/obj/item/flashlight/lamp/lava/cyan light_color = COLOR_CYAN -/obj/item/device/flashlight/lamp/lava/green +/obj/item/flashlight/lamp/lava/green light_color = COLOR_GREEN -/obj/item/device/flashlight/lamp/lava/orange +/obj/item/flashlight/lamp/lava/orange light_color = COLOR_ORANGE -/obj/item/device/flashlight/lamp/lava/purple +/obj/item/flashlight/lamp/lava/purple light_color = COLOR_PURPLE -/obj/item/device/flashlight/lamp/lava/pink +/obj/item/flashlight/lamp/lava/pink light_color = COLOR_PINK -/obj/item/device/flashlight/lamp/lava/yellow +/obj/item/flashlight/lamp/lava/yellow light_color = COLOR_YELLOW -/obj/item/device/flashlight/lamp/stage +/obj/item/flashlight/lamp/stage name = "stage lamp" desc = "A portable, beautiful and flashy stage light!" light_color = COLOR_ORANGE icon_state = "stage" -/obj/item/device/flashlight/lamp/holodeck +/obj/item/flashlight/lamp/holodeck name = "holographic lighting orb" desc = "A floating orb that comes in a variety of colors. Optional holodeck lighting." anchored = 1 @@ -102,10 +102,10 @@ icon = 'icons/effects/props/holodeck/holodeck_tools.dmi' icon_state = "orb" -/obj/item/device/flashlight/lamp/holodeck/attack_hand(mob/user) +/obj/item/flashlight/lamp/holodeck/attack_hand(mob/user) toggle() -/obj/item/device/flashlight/lamp/box +/obj/item/flashlight/lamp/box name = "box lamp" desc = "A box-shaped traditional flame lamp. Less safe, more pretty." light_range = 5 diff --git a/code/game/objects/items/devices/lighting/marshalling_wand.dm b/code/game/objects/items/devices/lighting/marshalling_wand.dm index b36cc2e2bca..35df848e24b 100644 --- a/code/game/objects/items/devices/lighting/marshalling_wand.dm +++ b/code/game/objects/items/devices/lighting/marshalling_wand.dm @@ -1,4 +1,4 @@ -/obj/item/device/flashlight/marshallingwand +/obj/item/flashlight/marshallingwand name = "marshalling wand" desc = "A marshalling wand, used to direct air or space faring vessels during takeoff and landing." icon_state = "marshallingwand" @@ -8,7 +8,7 @@ light_range = 2 action_button_name = "Toggle Marshalling Wands" -/obj/item/device/flashlight/marshallingwand/AltClick(mob/user) +/obj/item/flashlight/marshallingwand/AltClick(mob/user) if(!use_check_and_message(user)) if(!isturf(user.loc)) to_chat(user, SPAN_WARNING("You cannot turn the light on while in this [user.loc].")) //To prevent some lighting anomalities.) @@ -17,10 +17,10 @@ user.update_action_buttons() return TRUE -/obj/item/device/flashlight/marshallingwand/ui_action_click() +/obj/item/flashlight/marshallingwand/ui_action_click() AltClick(usr) -/obj/item/device/flashlight/marshallingwand/attack_self(mob/user) +/obj/item/flashlight/marshallingwand/attack_self(mob/user) if(!on) to_chat(user, SPAN_WARNING("The wands need to be on before you can direct craft with them!")) return diff --git a/code/game/objects/items/devices/lighting/survival.dm b/code/game/objects/items/devices/lighting/survival.dm index fbe42929d95..0e7dbc6e5dc 100644 --- a/code/game/objects/items/devices/lighting/survival.dm +++ b/code/game/objects/items/devices/lighting/survival.dm @@ -1,4 +1,4 @@ -/obj/item/device/flashlight/survival +/obj/item/flashlight/survival name = "survival flashlight" desc = "A hand-held emergency light. This one has been modified with a larger, more efficient bulb pointing inwards." icon_state = "survival_flashlight" diff --git a/code/game/objects/items/devices/lightmeter.dm b/code/game/objects/items/devices/lightmeter.dm index f32eede9c4e..fe11c3f75d4 100644 --- a/code/game/objects/items/devices/lightmeter.dm +++ b/code/game/objects/items/devices/lightmeter.dm @@ -1,9 +1,9 @@ // Light meter, intended for debugging. -/obj/item/device/light_meter +/obj/item/light_meter name = "light meter" desc = "A simple device that measures ambient light levels." - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps" item_state = "radio" // Copied from debugger.dm @@ -17,7 +17,7 @@ var/low = 0 var/high = 1 -/obj/item/device/light_meter/attack_self(mob/user as mob) +/obj/item/light_meter/attack_self(mob/user as mob) var/turf/T = get_turf(user.loc) if (!T) to_chat(user, SPAN_ALERT("Unable to read light levels.")) @@ -30,7 +30,7 @@ to_chat(usr, SPAN_NOTICE(reading)) -/obj/item/device/light_meter/verb/set_low_bound() +/obj/item/light_meter/verb/set_low_bound() set category = "Object.Held" set name = "Set Detector Low-Bound" set src in usr @@ -41,7 +41,7 @@ low = num -/obj/item/device/light_meter/verb/set_high_bound() +/obj/item/light_meter/verb/set_high_bound() set category = "Object.Held" set name = "Set Detector High-Bound" set src in usr diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 3d4e158c98f..6d40ce2d27d 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -33,7 +33,7 @@ // The explosion cannot insta-kill anyone with 30% or more health. -/obj/item/device/lightreplacer +/obj/item/lightreplacer name = "light replacer" desc = "A device to automatically replace lights. Refill with working lightbulbs or sheets of glass." icon = 'icons/obj/janitor.dmi' @@ -57,14 +57,14 @@ var/store_broken = 0//If set, this lightreplacer will suck up and store broken bulbs var/max_stored = 10 -/obj/item/device/lightreplacer/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/lightreplacer/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(distance <= 2) . += "It has [uses] lights remaining." if (store_broken) . += "It is storing [stored()]/[max_stored] broken lights." -/obj/item/device/lightreplacer/advanced +/obj/item/lightreplacer/advanced name = "advanced light replacer" desc = "A specialised light replacer which stores more lights, refills faster from boxes, and sucks up broken bulbs. Empty into a disposal or trashbag when full!" icon_state = "adv_lightreplacer" @@ -75,11 +75,11 @@ max_uses = 30 uses = 0 //Starts empty -/obj/item/device/lightreplacer/New() +/obj/item/lightreplacer/New() failmsg = "The [name]'s refill light blinks red." ..() -/obj/item/device/lightreplacer/attackby(obj/item/attacking_item, mob/user) +/obj/item/lightreplacer/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/stack/material) && attacking_item.get_material_name() == "glass") var/obj/item/stack/G = attacking_item if(uses >= max_uses) @@ -105,8 +105,8 @@ to_chat(user, SPAN_WARNING("You need a working light.")) return TRUE - if(istype(attacking_item, /obj/item/device/lightreplacer)) - var/obj/item/device/lightreplacer/LR = attacking_item + if(istype(attacking_item, /obj/item/lightreplacer)) + var/obj/item/lightreplacer/LR = attacking_item if(LR.uses == LR.max_uses) to_chat(user, SPAN_WARNING("\The [LR] is already full!")) return TRUE @@ -116,20 +116,20 @@ to_chat(user, SPAN_NOTICE("You transfer the lights from \the [src] to \the [LR].")) return TRUE -/obj/item/device/lightreplacer/afterattack(var/atom/target, var/mob/living/user, proximity, params) +/obj/item/lightreplacer/afterattack(var/atom/target, var/mob/living/user, proximity, params) if (istype(target, /obj/item/storage/box)) if (box_contains_lights(target)) load_lights_from_box(target, user) else to_chat(user, "This box has no bulbs in it!") -/obj/item/device/lightreplacer/proc/box_contains_lights(var/obj/item/storage/box/box) +/obj/item/lightreplacer/proc/box_contains_lights(var/obj/item/storage/box/box) for (var/obj/item/light/L in box.contents) if (L.status == 0) return 1 return 0 -/obj/item/device/lightreplacer/proc/load_lights_from_box(var/obj/item/storage/box/box, var/mob/user) +/obj/item/lightreplacer/proc/load_lights_from_box(var/obj/item/storage/box/box, var/mob/user) var/boxstartloc = box.loc var/ourstartloc = src.loc user.visible_message(SPAN_NOTICE("[user] starts loading lights from the [box] into their [src]"), SPAN_NOTICE("You start loading lights from the [box] into the [src]")) @@ -158,38 +158,38 @@ to_chat(user, SPAN_NOTICE("The [src]'s refill light shines a solid green, indicating it's full and ready to go!")) -/obj/item/device/lightreplacer/proc/stored() +/obj/item/lightreplacer/proc/stored() var/count = 0 for (var/obj/item/light/L in src) count++ return count -/obj/item/device/lightreplacer/attack_self(mob/user) +/obj/item/lightreplacer/attack_self(mob/user) to_chat(usr, "It has [uses] lights remaining.") -/obj/item/device/lightreplacer/update_icon() +/obj/item/lightreplacer/update_icon() if(emagged) AddOverlays("emagged") -/obj/item/device/lightreplacer/proc/Use(var/mob/user) +/obj/item/lightreplacer/proc/Use(var/mob/user) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) AddUses(-1) return 1 // Negative numbers will subtract -/obj/item/device/lightreplacer/proc/AddUses(var/amount = 1) +/obj/item/lightreplacer/proc/AddUses(var/amount = 1) uses = min(max(uses + amount, 0), max_uses) -/obj/item/device/lightreplacer/proc/Charge(var/mob/user, var/amount = 1) +/obj/item/lightreplacer/proc/Charge(var/mob/user, var/amount = 1) charge += amount if(charge > 3) AddUses(1) charge = 0 -/obj/item/device/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U) +/obj/item/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U) if(target.status != LIGHT_OK) if(CanUse(U)) @@ -242,7 +242,7 @@ to_chat(U, "There is a working [target.fitting] already inserted.") return -/obj/item/device/lightreplacer/emag_act(var/remaining_charges, var/mob/user) +/obj/item/lightreplacer/emag_act(var/remaining_charges, var/mob/user) emagged = !emagged playsound(src.loc, SFX_SPARKS, 100, 1) update_icon() @@ -250,7 +250,7 @@ //Can you use it? -/obj/item/device/lightreplacer/proc/CanUse(var/mob/living/user) +/obj/item/lightreplacer/proc/CanUse(var/mob/living/user) src.add_fingerprint(user) //Not sure what else to check for. Maybe if clumsy? if(uses > 0) diff --git a/code/game/objects/items/devices/magnetic_lock.dm b/code/game/objects/items/devices/magnetic_lock.dm index dfedceabdda..b4731be5445 100644 --- a/code/game/objects/items/devices/magnetic_lock.dm +++ b/code/game/objects/items/devices/magnetic_lock.dm @@ -4,7 +4,7 @@ #define LAYER_NORMAL 3 -/obj/item/device/magnetic_lock +/obj/item/magnetic_lock name = "magnetic door lock" desc = "A large, ID locked device used for completely locking down airlocks." icon = 'icons/obj/magnetic_locks.dmi' @@ -28,12 +28,12 @@ var/obj/machinery/door/airlock/target = null var/obj/item/cell/powercell -/obj/item/device/magnetic_lock/condition_hints(mob/user, distance, is_adjacent) +/obj/item/magnetic_lock/condition_hints(mob/user, distance, is_adjacent) . += ..() if (status == STATUS_BROKEN) . += SPAN_DANGER("It looks broken!") -/obj/item/device/magnetic_lock/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/magnetic_lock/feedback_hints(mob/user, distance, is_adjacent) . += ..() if (powercell) var/power = round(powercell.charge / powercell.maxcharge * 100) @@ -41,33 +41,33 @@ else . += SPAN_WARNING("It has no powercell to power it!") -/obj/item/device/magnetic_lock/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/magnetic_lock/mechanics_hints(mob/user, distance, is_adjacent) . += ..() if(department) . += "Once applied to an airlock, this device can be activated/deactivated by swiping an ID from the [department] department across it." -/obj/item/device/magnetic_lock/security +/obj/item/magnetic_lock/security department = "Security" icon_state = "inactive_Security" req_access = list(ACCESS_SECURITY) -/obj/item/device/magnetic_lock/engineering +/obj/item/magnetic_lock/engineering department = "Engineering" icon_state = "inactive_Engineering" req_access = null req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS) -/obj/item/device/magnetic_lock/security/legion +/obj/item/magnetic_lock/security/legion name = "legion magnetic door lock" req_access = null req_one_access = list(ACCESS_LEGION, ACCESS_TCAF_SHIPS) w_class = WEIGHT_CLASS_SMALL -/obj/item/device/magnetic_lock/security/legion/Initialize() +/obj/item/magnetic_lock/security/legion/Initialize() . = ..() desc = "A large, ID locked device used for completely locking down airlocks. This one carries the insignia of the Tau Ceti Foreign Legion." -/obj/item/device/magnetic_lock/Initialize() +/obj/item/magnetic_lock/Initialize() . = ..() powercell = new /obj/item/cell/high() @@ -93,7 +93,7 @@ status = STATUS_ACTIVE attach(newtarget) -/obj/item/device/magnetic_lock/attack_hand(var/mob/user) +/obj/item/magnetic_lock/attack_hand(var/mob/user) add_fingerprint(user) if (constructionstate == 1 && powercell) powercell.update_icon() @@ -112,14 +112,14 @@ else ..() -/obj/item/device/magnetic_lock/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) +/obj/item/magnetic_lock/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit) . = ..() if(. != BULLET_ACT_HIT) return . takedamage(hitting_projectile.damage) -/obj/item/device/magnetic_lock/attackby(obj/item/attacking_item, mob/user) +/obj/item/magnetic_lock/attackby(obj/item/attacking_item, mob/user) if (status == STATUS_BROKEN) to_chat(user, SPAN_DANGER("[src] is broken beyond repair!")) return TRUE @@ -249,7 +249,7 @@ setconstructionstate(3) return TRUE -/obj/item/device/magnetic_lock/process() +/obj/item/magnetic_lock/process() if(!processpower) return var/obj/item/cell/C = powercell @@ -267,7 +267,7 @@ detach(0) last_process_time = world.time -/obj/item/device/magnetic_lock/proc/check_target(var/obj/machinery/door/airlock/newtarget, var/mob/user as mob) +/obj/item/magnetic_lock/proc/check_target(var/obj/machinery/door/airlock/newtarget, var/mob/user as mob) if (status == STATUS_BROKEN) to_chat(user, SPAN_DANGER("[src] is damaged beyond repair! It cannot be used!")) return 0 @@ -290,7 +290,7 @@ return 1 -/obj/item/device/magnetic_lock/proc/attachto(var/obj/machinery/door/airlock/newtarget, var/mob/user as mob) +/obj/item/magnetic_lock/proc/attachto(var/obj/machinery/door/airlock/newtarget, var/mob/user as mob) if (!check_target(newtarget, user)) return user.visible_message(SPAN_NOTICE("[user] starts mounting [src] onto [newtarget]."), @@ -341,7 +341,7 @@ return -/obj/item/device/magnetic_lock/proc/setconstructionstate(var/newstate) +/obj/item/magnetic_lock/proc/setconstructionstate(var/newstate) if (!powercell && newstate == 1) setconstructionstate(2) return @@ -351,7 +351,7 @@ constructionstate = newstate update_icon() -/obj/item/device/magnetic_lock/proc/detach(var/playflick = 1) +/obj/item/magnetic_lock/proc/detach(var/playflick = 1) if (target) if (playflick) @@ -375,7 +375,7 @@ STOP_PROCESSING(SSprocessing, src) last_process_time = 0 -/obj/item/device/magnetic_lock/proc/attach(var/obj/machinery/door/airlock/newtarget as obj) +/obj/item/magnetic_lock/proc/attach(var/obj/machinery/door/airlock/newtarget as obj) layer = ABOVE_DOOR_LAYER newtarget.bracer = src @@ -389,7 +389,7 @@ flick("deploy_[department]", src) update_icon() -/obj/item/device/magnetic_lock/update_icon() +/obj/item/magnetic_lock/update_icon() if (status == STATUS_ACTIVE && target) icon_state = "active_[department]" switch (dir) @@ -415,7 +415,7 @@ pixel_y = 0 update_overlays() -/obj/item/device/magnetic_lock/proc/update_overlays() +/obj/item/magnetic_lock/proc/update_overlays() ClearOverlays() switch (status) if (STATUS_BROKEN) @@ -435,7 +435,7 @@ if (1 to 4) AddOverlays("overlay_deconstruct_[constructionstate]") -/obj/item/device/magnetic_lock/proc/takedamage(var/damage) +/obj/item/magnetic_lock/proc/takedamage(var/damage) if(invincible) return health -= rand(damage/2, damage) @@ -453,7 +453,7 @@ if (prob(50)) spark(target ? target : src, 5, GLOB.alldirs) -/obj/item/device/magnetic_lock/keypad +/obj/item/magnetic_lock/keypad name = "magnetic door lock" desc = "A large, passcode locked device used for completely locking down airlocks." @@ -462,35 +462,35 @@ var/passcode = "open" var/configurable = TRUE -/obj/item/device/magnetic_lock/keypad/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/magnetic_lock/keypad/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Keypad-enabled magnetic locks require a custom passcode to unlock them, configured on initial use." -/obj/item/device/magnetic_lock/keypad/update_overlays() +/obj/item/magnetic_lock/keypad/update_overlays() ..() switch (status) if (STATUS_INACTIVE to STATUS_ACTIVE) - if(istype(src, /obj/item/device/magnetic_lock/keypad)) + if(istype(src, /obj/item/magnetic_lock/keypad)) AddOverlays("overlay_keypad") -/obj/item/device/magnetic_lock/keypad/ui_interact(mob/user, datum/tgui/ui) +/obj/item/magnetic_lock/keypad/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Maglock", "Maglock", 300, 250) ui.open() -/obj/item/device/magnetic_lock/keypad/attack_hand(var/mob/user) +/obj/item/magnetic_lock/keypad/attack_hand(var/mob/user) . = ..() if(.) return ui_interact(user) -/obj/item/device/magnetic_lock/keypad/ui_data(mob/user) +/obj/item/magnetic_lock/keypad/ui_data(mob/user) var/list/data = list() data["locked"] = locked return data -/obj/item/device/magnetic_lock/keypad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/magnetic_lock/keypad/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 1b6a540e8a5..8b88c4b1284 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -1,8 +1,8 @@ -/obj/item/device/megaphone +/obj/item/megaphone name = "megaphone" desc = "Pretend to be a director for a brief moment before someone tackles you to make you shut up." desc_extended = "Annoy your colleagues! Scare interns! Impress no one!" - icon = 'icons/obj/item/device/megaphone.dmi' + icon = 'icons/obj/item/megaphone.dmi' icon_state = "megaphone" item_state = "megaphone" w_class = WEIGHT_CLASS_SMALL @@ -15,15 +15,15 @@ var/activation_sound = 'sound/items/megaphone.ogg' var/needs_user_location = TRUE -/obj/item/device/megaphone/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/megaphone/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Use it on yourself to broadcast something. LOUDLY." -/obj/item/device/multitool/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/multitool/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "This can be emagged to make it broadcast random insults or self-incriminations when used." -/obj/item/device/megaphone/attack_self(mob/living/user as mob) +/obj/item/megaphone/attack_self(mob/living/user as mob) if(user.client) if(user.client.prefs.muted & MUTE_IC) to_chat(src, SPAN_WARNING("You cannot speak in IC (muted).")) @@ -63,69 +63,69 @@ spamcheck = world.time + 50 return -/obj/item/device/megaphone/emag_act(var/remaining_charges, var/mob/user) +/obj/item/megaphone/emag_act(var/remaining_charges, var/mob/user) if(!emagged) to_chat(user, SPAN_WARNING("You overload \the [src]'s voice synthesizer.")) emagged = 1 insults = rand(3, 5)//to prevent dickflooding return 1 -/obj/item/device/megaphone/red +/obj/item/megaphone/red name = "red megaphone" desc = "To make people do your bidding." desc_extended = "It's in a menacing crimson red." icon_state = "megaphone_red" item_state = "megaphone_red" -/obj/item/device/megaphone/sec +/obj/item/megaphone/sec name = "security megaphone" desc = "To stop people from stepping over the police tape." desc_extended = "Nothing to see here. Move along." icon_state = "megaphone_sec" item_state = "megaphone_sec" -/obj/item/device/megaphone/med +/obj/item/megaphone/med name = "medical megaphone" desc = "To make people leave the ICU." desc_extended = "Realistcally only used to startle the CMO's cat." icon_state = "megaphone_med" item_state = "megaphone_med" -/obj/item/device/megaphone/sci +/obj/item/megaphone/sci name = "science megaphone" desc = "To make people stand clear of the blast zone." desc_extended = "Something to rival the explosions heard in the science department." icon_state = "megaphone_sci" item_state = "megaphone_sci" -/obj/item/device/megaphone/engi +/obj/item/megaphone/engi name = "engineering megaphone" desc = "To make people get out of construction sites." desc_extended = "At home in construction sites and road works, it'll stick by you in diverting traffic and dim-witted coworkers." icon_state = "megaphone_engi" item_state = "megaphone_engi" -/obj/item/device/megaphone/cargo +/obj/item/megaphone/cargo name = "operations megaphone" desc = "To make people to push crates." desc_extended = "Only certified forklift operators will be able to handle the sheer power of this megaphone. Either that, or just be the Operations Manager." icon_state = "megaphone_cargo" item_state = "megaphone_cargo" -/obj/item/device/megaphone/command +/obj/item/megaphone/command name = "command megaphone" desc = "To make people to get back to work." desc_extended = "Exude authority by decree of having the louder voice." icon_state = "megaphone_command" item_state = "megaphone_command" -/obj/item/device/megaphone/clown +/obj/item/megaphone/clown name = "clown's megaphone" desc = "Something that should not exist." icon_state = "megaphone_clown" item_state = "megaphone_clown" -/obj/item/device/megaphone/stagemicrophone +/obj/item/megaphone/stagemicrophone name = "dazzling stage microphone" desc = "A glamorous looking stage microphone, complete with running lights and holographic effects around it." icon_state = "stagemicrophone" diff --git a/code/game/objects/items/devices/memorywiper.dm b/code/game/objects/items/devices/memorywiper.dm index 635c7e00ad4..bf563458ac0 100644 --- a/code/game/objects/items/devices/memorywiper.dm +++ b/code/game/objects/items/devices/memorywiper.dm @@ -1,4 +1,4 @@ -/obj/item/device/memorywiper +/obj/item/memorywiper name = "portable memory wiper" desc = "Inset into a sturdy pelican case, this computer holds the software and wiring necessary to wipe and factory reset any IPC." icon = 'icons/obj/memorywiper.dmi' @@ -12,18 +12,18 @@ var/datum/progressbar/wipe_bar var/wipe_start_time = 0 -/obj/item/device/memorywiper/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/memorywiper/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "ALT-click the device while it's set down on a surface to open or close it." . += "Left-click on it while it is open to operate it." -/obj/item/device/memorywiper/Destroy() +/obj/item/memorywiper/Destroy() if(attached) attached = null wiping = FALSE return ..() -/obj/item/device/memorywiper/AltClick() +/obj/item/memorywiper/AltClick() if(use_check(usr)) return if(!isturf(loc)) @@ -35,7 +35,7 @@ playsound(src.loc, 'sound/items/storage/briefcase.ogg', 50, 1, -5) update_icon() -/obj/item/device/memorywiper/update_icon() +/obj/item/memorywiper/update_icon() ClearOverlays() if(anchored) icon_state = "[initial(icon_state)]_opened" @@ -46,7 +46,7 @@ else icon_state = initial(icon_state) -/obj/item/device/memorywiper/mouse_drop_dragged(atom/over, mob/user, src_location, over_location, params) +/obj/item/memorywiper/mouse_drop_dragged(atom/over, mob/user, src_location, over_location, params) ..() if(use_check_and_message(usr)) return @@ -68,7 +68,7 @@ plug(over) visible_message("[usr] plugs \the [src] into \the [attached]'s maintenance port.") -/obj/item/device/memorywiper/attack_hand(user as mob) +/obj/item/memorywiper/attack_hand(user as mob) if(attached) to_chat(user, SPAN_NOTICE("You initialize the memory wipe protocols. This procedure will take approximately 30 seconds.")) to_chat(attached, SPAN_WARNING("The computer hums to life and you feel your memories bleed away into nothingness.")) @@ -89,7 +89,7 @@ if(..()) return -/obj/item/device/memorywiper/proc/memorywipe() +/obj/item/memorywiper/proc/memorywipe() if(attached && wiping) visible_message(SPAN_NOTICE("\The [src] pings, \"Memory wipe protocols complete.\"")) playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) @@ -99,14 +99,14 @@ if("Ghost") attached.ghostize(0) -/obj/item/device/memorywiper/process() +/obj/item/memorywiper/process() if(attached) if(!attached.Adjacent(src)) attached.visible_message(SPAN_WARNING("The cable rips out of [attached]'s maintenace port."), SPAN_DANGER("\The [src]'s cable rips out of your maintenace port.")) unplug() return -/obj/item/device/memorywiper/proc/unplug() +/obj/item/memorywiper/proc/unplug() if(wiping) visible_message(SPAN_WARNING("\The [src]'s screen flashes, \"ERROR : IPC NOT FOUND, TERMINATING PROTOCOL.\"")) playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, TRUE) @@ -116,7 +116,7 @@ STOP_PROCESSING(SSprocessing, src) update_icon() -/obj/item/device/memorywiper/proc/plug(over_object) +/obj/item/memorywiper/proc/plug(over_object) playsound(src.loc, 'sound/weapons/click.ogg', 25, 1) attached = over_object START_PROCESSING(SSprocessing, src) diff --git a/code/game/objects/items/devices/minedetector.dm b/code/game/objects/items/devices/minedetector.dm index d236221cda9..f0c1a81345f 100644 --- a/code/game/objects/items/devices/minedetector.dm +++ b/code/game/objects/items/devices/minedetector.dm @@ -1,7 +1,7 @@ -/obj/item/device/mine_detector +/obj/item/mine_detector name = "mine detector" desc = "A device capable of detecting mines and traps in a range." - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps" item_state = "radio" @@ -26,7 +26,7 @@ ///The timer ID for the automatic rescans var/timer_id = null -/obj/item/device/mine_detector/attack_self(mob/user) +/obj/item/mine_detector/attack_self(mob/user) . = ..() ClearOverlays() //Apply the delay and check it is passed, so a new scan can be done @@ -51,7 +51,7 @@ timer_id = null -/obj/item/device/mine_detector/proc/perform_scan(mob/user) +/obj/item/mine_detector/proc/perform_scan(mob/user) var/list/turfs_scanned = get_turfs_in_cone(get_turf(src), dir2angle(user.dir), detection_range, detection_angle) @@ -99,7 +99,7 @@ Subtypes #############*/ -/obj/item/device/mine_detector/advanced +/obj/item/mine_detector/advanced name = "advanced mine detector" desc = "A device capable of detecting mines and traps in a range. This one is more advanced, featuring automatic scanning as well as a broader detection angle." detection_angle = 45 diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index c80f23c6820..4c75849e0f9 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -3,10 +3,10 @@ #define MODKIT_RIG 3 #define MODKIT_FULL 6 -/obj/item/device/modkit +/obj/item/modkit name = "voidsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user." - icon = 'icons/obj/item/device/modkit.dmi' + icon = 'icons/obj/item/modkit.dmi' icon_state = "modkit" item_state = "restock_unit" var/parts = MODKIT_FULL @@ -19,11 +19,11 @@ /obj/item/rig_assembly ) -/obj/item/device/modkit/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/modkit/feedback_hints(mob/user, distance, is_adjacent) . += ..() . += "It looks as though it modifies voidsuits to fit [is_multi_species ? "users of multiple species" : "[target_species] users"]." -/obj/item/device/modkit/afterattack(obj/O, mob/user as mob, proximity) +/obj/item/modkit/afterattack(obj/O, mob/user as mob, proximity) if(!proximity) return @@ -83,31 +83,31 @@ user.drop_from_inventory(src,O) qdel(src) -/obj/item/device/modkit/tajaran +/obj/item/modkit/tajaran name = "tajaran voidsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for tajara." target_species = BODYTYPE_TAJARA -/obj/item/device/modkit/unathi +/obj/item/modkit/unathi name = "unathi voidsuit modification kit" target_species = BODYTYPE_UNATHI -/obj/item/device/modkit/skrell +/obj/item/modkit/skrell name = "skrell voidsuit modification kit" target_species = BODYTYPE_SKRELL -/obj/item/device/modkit/ipc +/obj/item/modkit/ipc name = "ipc voidsuit modification kit" target_species = BODYTYPE_IPC -/obj/item/device/modkit/multi_species +/obj/item/modkit/multi_species name = "multi-species voidsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for a wide range of alien species." is_multi_species = TRUE /obj/item/voidsuit_modkit name = "voidsuit kit" - icon = 'icons/obj/item/device/modkit.dmi' + icon = 'icons/obj/item/modkit.dmi' icon_state = "modkit" item_state = "restock_unit" contained_sprite = TRUE @@ -271,21 +271,21 @@ /obj/item/storage/box/species_modkit name = "multi-species modkit box" desc = "Contains modkits to convert a voidsuit to a wide range of available species." - starts_with = list(/obj/item/device/modkit/multi_species = 4) + starts_with = list(/obj/item/modkit/multi_species = 4) /obj/item/storage/box/unathi_modkit name = "multi-species modkit box" desc = "Contains modkits to convert a voidsuit for an Unathi wearer." - starts_with = list(/obj/item/device/modkit/unathi = 4) + starts_with = list(/obj/item/modkit/unathi = 4) /obj/item/storage/box/ipc_modkit name = "ipc modkit box" desc = "Contains modkits to convert a voidsuit for an IPC wearer." - starts_with = list(/obj/item/device/modkit/ipc = 4) + starts_with = list(/obj/item/modkit/ipc = 4) /obj/item/voidsuit_modkit_multi //for converting between a large range of options instead of having 5000 subtypes name = "voidsuit kit" - icon = 'icons/obj/item/device/modkit.dmi' + icon = 'icons/obj/item/modkit.dmi' icon_state = "modkit" item_state = "restock_unit" contained_sprite = TRUE diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 62ad61e4a1c..dfe4d91504b 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -3,10 +3,10 @@ * */ -/obj/item/device/multitool +/obj/item/multitool name = "multitool" desc = "This small, handheld device is made of durable, insulated plastic. It has a electrode jack, perfect for interfacing with numerous machines, as well as an in-built NT-SmartTrack! system." - icon = 'icons/obj/item/device/multitool.dmi' + icon = 'icons/obj/item/multitool.dmi' icon_state = "multitool" item_state = "multitool" item_icons = null @@ -36,7 +36,7 @@ tool_behaviour = TOOL_MULTITOOL -/obj/item/device/multitool/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/multitool/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "You can use this on a variety of objects (including APCs, airlocks and more) to try to hack them without cutting wires." . += "Using it in-hand will toggle tracking of nearby APCs." @@ -44,26 +44,26 @@ . += "It is used for interacting with a variety of machines." . += "It is a necessary tool for integrated electronics wiring." -/obj/item/device/multitool/Destroy() +/obj/item/multitool/Destroy() unregister_buffer(buffer_object) QDEL_NULL(apc_indicator) return ..() -/obj/item/device/multitool/proc/get_buffer(var/typepath) +/obj/item/multitool/proc/get_buffer(var/typepath) // Only allow clearing the buffer name when someone fetches the buffer. // Means you cannot be sure the source hasn't been destroyed until the very moment it's needed. get_buffer_name(TRUE) if(buffer_object && (!typepath || istype(buffer_object, typepath))) return buffer_object -/obj/item/device/multitool/proc/get_buffer_name(var/null_name_if_missing = FALSE) +/obj/item/multitool/proc/get_buffer_name(var/null_name_if_missing = FALSE) if(buffer_object) buffer_name = buffer_object.name else if(null_name_if_missing) buffer_name = null return buffer_name -/obj/item/device/multitool/proc/set_buffer(var/atom/buffer) +/obj/item/multitool/proc/set_buffer(var/atom/buffer) if(!buffer || istype(buffer)) buffer_name = buffer ? buffer.name : null if(buffer != buffer_object) @@ -73,11 +73,11 @@ RegisterSignal(buffer_object, COMSIG_QDELETING, PROC_REF(on_buffer_object_deletion)) update_icon() -/obj/item/device/multitool/proc/on_buffer_object_deletion(datum/source) +/obj/item/multitool/proc/on_buffer_object_deletion(datum/source) SIGNAL_HANDLER unregister_buffer(source) -/obj/item/device/multitool/proc/unregister_buffer(atom/buffer_to_unregister) +/obj/item/multitool/proc/unregister_buffer(atom/buffer_to_unregister) // Only remove the buffered object, don't reset the name // This means one cannot know if the buffer has been destroyed until one attempts to use it. if(buffer_to_unregister == buffer_object && buffer_object) @@ -85,7 +85,7 @@ buffer_object = null update_icon() -/obj/item/device/multitool/resolve_attackby(atom/A, mob/user, var/click_parameters) +/obj/item/multitool/resolve_attackby(atom/A, mob/user, var/click_parameters) if(!isobj(A)) return ..(A, user, click_parameters) @@ -98,19 +98,19 @@ MT.interact(src, user) return 1 -/obj/item/device/multitool/attack_self(mob/user) +/obj/item/multitool/attack_self(mob/user) interact(user) -/obj/item/device/multitool/interact(mob/user) +/obj/item/multitool/interact(mob/user) ui_interact(user) -/obj/item/device/multitool/ui_interact(mob/user, datum/tgui/ui) +/obj/item/multitool/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Multitool", "Multitool", 300, 250) ui.open() -/obj/item/device/multitool/ui_data(mob/user) +/obj/item/multitool/ui_data(mob/user) var/list/data = list() data["tracking_apc"] = tracking_apc @@ -119,7 +119,7 @@ data["selected_io"] = list("name" = selected_io.name, "type" = selected_io.io_type) return data -/obj/item/device/multitool/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/multitool/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return TRUE @@ -142,7 +142,7 @@ update_icon() -/obj/item/device/multitool/update_icon() +/obj/item/multitool/update_icon() if(tracking_apc) icon_state = "multitool_clear" else if(selected_io) @@ -156,7 +156,7 @@ else icon_state = "multitool" -/obj/item/device/multitool/process() +/obj/item/multitool/process() if(!apc_indicator) return PROCESS_KILL @@ -180,7 +180,7 @@ apc_indicator.icon_state = "far" SetOverlays(apc_indicator) -/obj/item/device/multitool/proc/wire(datum/integrated_io/io, mob/user) +/obj/item/multitool/proc/wire(datum/integrated_io/io, mob/user) if(!io.holder.assembly) to_chat(user, SPAN_WARNING("\The [io.holder] needs to be secured inside an assembly first.")) return @@ -210,7 +210,7 @@ update_icon() -/obj/item/device/multitool/proc/unwire(datum/integrated_io/io1, datum/integrated_io/io2, mob/user) +/obj/item/multitool/proc/unwire(datum/integrated_io/io1, datum/integrated_io/io2, mob/user) if(!io1.linked.len || !io2.linked.len) to_chat(user, SPAN_WARNING("There is nothing connected to the data channel.")) return diff --git a/code/game/objects/items/devices/oxycandle.dm b/code/game/objects/items/devices/oxycandle.dm index 705ee1b2973..d356d1f8d75 100644 --- a/code/game/objects/items/devices/oxycandle.dm +++ b/code/game/objects/items/devices/oxycandle.dm @@ -1,7 +1,7 @@ -/obj/item/device/oxycandle +/obj/item/oxycandle name = "oxygen candle" desc = "A steel tube with the words 'OXYGEN - PULL CORD TO IGNITE' stamped on the side. A small label warns against using the device underwater." - icon = 'icons/obj/item/device/oxycandle.dmi' + icon = 'icons/obj/item/oxycandle.dmi' icon_state = "oxycandle" item_state = "oxycandle" w_class = WEIGHT_CLASS_SMALL // Should fit into internal's box or maybe pocket @@ -15,7 +15,7 @@ light_power = 2 action_button_name = null -/obj/item/device/oxycandle/attack_self(mob/user) +/obj/item/oxycandle/attack_self(mob/user) if(!on) to_chat(user, SPAN_NOTICE("You pull the cord and [src] ignites.")) light_range = light_range @@ -31,7 +31,7 @@ START_PROCESSING(SSprocessing, src) // Process of Oxygen candles releasing air. Makes 200 volume of oxygen and nitrogen mix -/obj/item/device/oxycandle/process() +/obj/item/oxycandle/process() if(!loc) return var/turf/pos = get_turf(src) @@ -60,7 +60,7 @@ GAS_NITROGEN = N2STANDARD * (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)) air_contents.adjust_multi(GAS_OXYGEN, air_mix[GAS_OXYGEN], GAS_NITROGEN, air_mix[GAS_NITROGEN]) -/obj/item/device/oxycandle/update_icon() +/obj/item/oxycandle/update_icon() if(on) icon_state = "oxycandle_on" item_state = icon_state @@ -71,7 +71,7 @@ set_light(0) update_held_icon() -/obj/item/device/oxycandle/Destroy() +/obj/item/oxycandle/Destroy() QDEL_NULL(air_contents) STOP_PROCESSING(SSprocessing, src) . = ..() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 00fba934939..e1b23e8b789 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -1,4 +1,4 @@ -/obj/item/device/paicard +/obj/item/paicard name = "personal AI device" icon = 'icons/obj/pai.dmi' icon_state = "pai" @@ -7,7 +7,7 @@ slot_flags = SLOT_BELT origin_tech = list(TECH_DATA = 2) var/list/installed_encryptionkeys = list() - var/obj/item/device/radio/radio + var/obj/item/radio/radio var/looking_for_personality = 0 var/mob/living/silicon/pai/pai var/move_delay = 0 @@ -16,7 +16,7 @@ light_range = 1 light_color = COLOR_BRIGHT_GREEN -/obj/item/device/paicard/relaymove(mob/living/user, direction) +/obj/item/paicard/relaymove(mob/living/user, direction) . = ..() if(user.stat || user.stunned) @@ -34,28 +34,28 @@ if(istype(rig)) rig.forced_move(direction, user) -/obj/item/device/paicard/Initialize() +/obj/item/paicard/Initialize() . = ..() AddOverlays("pai_off") SSpai.all_pai_devices += src update_light() -/obj/item/device/paicard/Destroy() +/obj/item/paicard/Destroy() SSpai.all_pai_devices -= src //Will stop people throwing friend pAIs into the singularity so they can respawn if(pai) pai.death(0) return ..() -/obj/item/device/paicard/attackby(obj/item/attacking_item, mob/user) +/obj/item/paicard/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/card/id)) scan_ID(attacking_item, user) return TRUE - else if(istype(attacking_item, /obj/item/device/encryptionkey)) + else if(istype(attacking_item, /obj/item/encryptionkey)) if(length(installed_encryptionkeys) > 2) to_chat(user, SPAN_WARNING("\The [src] already has the full number of possible encryption keys installed!")) return TRUE - var/obj/item/device/encryptionkey/EK = attacking_item + var/obj/item/encryptionkey/EK = attacking_item var/added_channels = FALSE for(var/thing in (EK.channels | EK.additional_channels)) if(!radio.channels[thing]) @@ -77,7 +77,7 @@ return user.visible_message("[user] uses \the [attacking_item] to pop the encryption key[length(installed_encryptionkeys) > 1 ? "s" : ""] out of \the [src].", SPAN_NOTICE("You use \the [attacking_item] to pop the encryption key[length(installed_encryptionkeys) > 1 ? "s" : ""] out of \the [src].")) for(var/key in installed_encryptionkeys) - var/obj/item/device/encryptionkey/EK = key + var/obj/item/encryptionkey/EK = key EK.forceMove(get_turf(src)) installed_encryptionkeys -= EK recalculateChannels() @@ -88,10 +88,10 @@ return TRUE pai.attackby(attacking_item, user) -/obj/item/device/paicard/proc/recalculateChannels() +/obj/item/paicard/proc/recalculateChannels() radio.channels = list("Common" = radio.FREQ_LISTENING, "Entertainment" = radio.FREQ_LISTENING) for(var/keyslot in installed_encryptionkeys) - var/obj/item/device/encryptionkey/EK = keyslot + var/obj/item/encryptionkey/EK = keyslot for(var/ch_name in (EK.channels | EK.additional_channels)) radio.channels[ch_name] = radio.FREQ_LISTENING @@ -108,7 +108,7 @@ //Scanning an ID replaces any previously stored access with the new set. //Only cards that match the imprinted DNA can be used, it's not a free Agent ID card. //Possible TODO in future, allow emagging a paicard to let it work like an agent ID, accumulating access from any ID -/obj/item/device/paicard/proc/scan_ID(var/obj/item/card/id/card, var/mob/user) +/obj/item/paicard/proc/scan_ID(var/obj/item/card/id/card, var/mob/user) if (!pai) to_chat(user, SPAN_WARNING("Error: ID Registration failed. No pAI personality installed.")) playsound(src.loc, 'sound/machines/buzz-two.ogg', 20, 0) @@ -131,13 +131,13 @@ to_chat(user, SPAN_NOTICE("ID Registration for [pai.id_card.registered_name] is a success. PAI access updated!")) return 1 -/obj/item/device/paicard/proc/ID_readout() +/obj/item/paicard/proc/ID_readout() if (pai.id_card && pai.id_card.registered_name) return SPAN_NOTICE("Identity of owner: [pai.id_card.registered_name] registered.") else return SPAN_WARNING("No ID card registered! Please scan your ID to share access.") -/obj/item/device/paicard/attack_self(mob/user) +/obj/item/paicard/attack_self(mob/user) if (!in_range(src, user)) return user.set_machine(src) @@ -337,7 +337,7 @@ onclose(user, "paicard") return -/obj/item/device/paicard/Topic(href, href_list) +/obj/item/paicard/Topic(href, href_list) if(!usr || usr.stat) return @@ -389,19 +389,19 @@ // WIRE_RECEIVE = 2 // WIRE_TRANSMIT = 4 -/obj/item/device/paicard/proc/setPersonality(mob/living/silicon/pai/personality) +/obj/item/paicard/proc/setPersonality(mob/living/silicon/pai/personality) src.pai = personality AddOverlays("pai-happy") playsound(src, 'sound/effects/pai/pai_restore.ogg', 75) -/obj/item/device/paicard/proc/removePersonality() +/obj/item/paicard/proc/removePersonality() src.pai = null ClearOverlays() AddOverlays("pai-off") -/obj/item/device/paicard +/obj/item/paicard var/current_emotion = 1 -/obj/item/device/paicard/proc/setEmotion(var/emotion) +/obj/item/paicard/proc/setEmotion(var/emotion) if(pai) ClearOverlays() var/new_state @@ -425,30 +425,30 @@ AddOverlays(new_state) current_emotion = emotion -/obj/item/device/paicard/proc/alertUpdate() +/obj/item/paicard/proc/alertUpdate() var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) M.show_message(SPAN_NOTICE("\The [src] flashes a message across its screen, \"Additional personalities available for download.\""), 3, SPAN_NOTICE("\The [src] bleeps electronically."), 2) -/obj/item/device/paicard/emp_act(severity) +/obj/item/paicard/emp_act(severity) . = ..() for(var/mob/M in src) M.emp_act(severity) -/obj/item/device/paicard/ex_act(severity) +/obj/item/paicard/ex_act(severity) if(pai) pai.ex_act(severity) else qdel(src) -/obj/item/device/paicard/see_emote(mob/living/M, text) +/obj/item/paicard/see_emote(mob/living/M, text) if(pai && pai.client && !pai.canmove) var/rendered = span("message", "[text]") pai.show_message(rendered, 2) ..() -/obj/item/device/paicard/dropped(mob/user) +/obj/item/paicard/dropped(mob/user) . = ..() ///When an object is put into a container, drop fires twice. //once with it on the floor, and then once in the container @@ -457,11 +457,11 @@ update_location() -/obj/item/device/paicard/equipped(var/mob/user, var/slot) +/obj/item/paicard/equipped(var/mob/user, var/slot) ..() update_location(slot) -/obj/item/device/paicard/proc/update_location(var/slotnumber = null) +/obj/item/paicard/proc/update_location(var/slotnumber = null) if (!pai) return @@ -471,7 +471,7 @@ report_onmob_location(1, slotnumber, pai) -/obj/item/device/paicard/show_message(msg, type, alt, alt_type) +/obj/item/paicard/show_message(msg, type, alt, alt_type) if(pai && pai.client) var/rendered = span("message", "[msg]") pai.show_message(rendered, type) diff --git a/code/game/objects/items/devices/paint_sprayer.dm b/code/game/objects/items/devices/paint_sprayer.dm index a26f416582a..72d4cb62b62 100644 --- a/code/game/objects/items/devices/paint_sprayer.dm +++ b/code/game/objects/items/devices/paint_sprayer.dm @@ -3,10 +3,10 @@ #define AIRLOCK_REGION_STRIPE "Stripe" #define AIRLOCK_REGION_WINDOW "Window" -/obj/item/device/paint_sprayer +/obj/item/paint_sprayer name = "paint gun" desc = "A Hephaestus-made paint gun that uses microbes to replenish its paint storage. Very high-tech and fancy too!" - icon = 'icons/obj/item/device/paint_sprayer.dmi' + icon = 'icons/obj/item/paint_sprayer.dmi' icon_state = "paint_sprayer" item_state = "mister" var/decal = "remove all decals" @@ -79,20 +79,20 @@ "bulkhead black" = COLOR_WALL_GUNMETAL ) -/obj/item/device/paint_sprayer/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/paint_sprayer/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "CTRL-click a turf with the paint sprayer to copy the color(s) used on it." . += "SHIFT-click a turf with the paint sprayer to clear all decals from it." -/obj/item/device/paint_sprayer/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/paint_sprayer/feedback_hints(mob/user, distance, is_adjacent) . += ..() . += "It is configured to produce the '[SPAN_NOTICE(decal)]' decal with a direction of '[SPAN_NOTICE(paint_dir)]' using [SPAN_NOTICE(paint_colour)] paint." -/obj/item/device/paint_sprayer/update_icon() +/obj/item/paint_sprayer/update_icon() ClearOverlays() AddOverlays(overlay_image(icon, "paint_sprayer_color", paint_colour)) -/obj/item/device/paint_sprayer/afterattack(var/atom/A, var/mob/user, proximity, params) +/obj/item/paint_sprayer/afterattack(var/atom/A, var/mob/user, proximity, params) if(!proximity) return @@ -126,7 +126,7 @@ else if (istype(A, /turf/simulated/floor)) return paint_floor(A, user, params) -/obj/item/device/paint_sprayer/proc/paint_floor(turf/simulated/floor/F, mob/user, params) +/obj/item/paint_sprayer/proc/paint_floor(turf/simulated/floor/F, mob/user, params) if(!F.flooring.can_paint) to_chat(user, SPAN_WARNING("\The [src] cannot paint this type of flooring.")) return @@ -184,7 +184,7 @@ playsound(get_turf(src), 'sound/effects/spray3.ogg', 30, 1, -6) new painting_decal(F, painting_dir, painting_colour) -/obj/item/device/paint_sprayer/attack_self(var/mob/user) +/obj/item/paint_sprayer/attack_self(var/mob/user) var/choice = tgui_alert(user, "Do you wish to change the decal type, paint direction, or paint colour?", "Paint Sprayer", list("Decal","Direction", "Colour")) if(choice == "Decal") choose_decal() @@ -193,7 +193,7 @@ else if(choice == "Colour") choose_colour() -/obj/item/device/paint_sprayer/proc/change_colour(new_colour, mob/user) +/obj/item/paint_sprayer/proc/change_colour(new_colour, mob/user) if (new_colour) paint_colour = new_colour if (user) @@ -208,7 +208,7 @@ if(ishuman(usr) || isrobot(usr)) var/mob/living/L = usr var/list/modifiers = params2list(params) - var/obj/item/device/paint_sprayer/paint_sprayer = L.get_active_hand() + var/obj/item/paint_sprayer/paint_sprayer = L.get_active_hand() if(istype(paint_sprayer)) if(!istype(L.buckled_to)) L.face_atom(src) @@ -221,7 +221,7 @@ . = ..() -/obj/item/device/paint_sprayer/proc/pick_color(atom/A, mob/user) +/obj/item/paint_sprayer/proc/pick_color(atom/A, mob/user) if (!user.Adjacent(A) || user.incapacitated()) return FALSE var/new_color @@ -233,7 +233,7 @@ to_chat(user, SPAN_WARNING("\The [A] does not have a colour that you could pick from.")) return TRUE // There was an attempt to pick a color. -/obj/item/device/paint_sprayer/proc/pick_color_from_floor(turf/simulated/floor/F, mob/user) +/obj/item/paint_sprayer/proc/pick_color_from_floor(turf/simulated/floor/F, mob/user) if (!F.decals || !F.decals.len) return FALSE var/list/available_colors = list() @@ -248,7 +248,7 @@ return FALSE return picked_color -/obj/item/device/paint_sprayer/proc/pick_color_from_airlock(obj/machinery/door/airlock/D, mob/user) +/obj/item/paint_sprayer/proc/pick_color_from_airlock(obj/machinery/door/airlock/D, mob/user) if (!D.paintable) return FALSE switch (select_airlock_region(D, user, "Where do you wish to pick the color from?")) @@ -261,7 +261,7 @@ else return FALSE -/obj/item/device/paint_sprayer/proc/paint_airlock(obj/machinery/door/airlock/D, mob/user) +/obj/item/paint_sprayer/proc/paint_airlock(obj/machinery/door/airlock/D, mob/user) if (!D.paintable) to_chat(user, SPAN_WARNING("You can't paint this airlock type.")) return FALSE @@ -277,7 +277,7 @@ return FALSE return TRUE -/obj/item/device/paint_sprayer/proc/select_airlock_region(obj/machinery/door/airlock/D, mob/user, input_text) +/obj/item/paint_sprayer/proc/select_airlock_region(obj/machinery/door/airlock/D, mob/user, input_text) var/choice var/list/choices = list() if (D.paintable & AIRLOCK_PAINTABLE_MAIN) @@ -291,7 +291,7 @@ return FALSE return choice -/obj/item/device/paint_sprayer/proc/remove_paint(atom/A, mob/user) +/obj/item/paint_sprayer/proc/remove_paint(atom/A, mob/user) if(!user.Adjacent(A) || user.incapacitated()) return FALSE if (istype(A, /turf/simulated/floor)) @@ -312,7 +312,7 @@ playsound(get_turf(src), 'sound/effects/spray3.ogg', 30, 1, -6) return . -/obj/item/device/paint_sprayer/verb/choose_colour() +/obj/item/paint_sprayer/verb/choose_colour() set name = "Choose Colour" set desc = "Choose a paintgun colour." set category = "Object.Held" @@ -323,7 +323,7 @@ var/new_colour = input(usr, "Choose a colour.", "Paint Sprayer", paint_colour) as color|null change_colour(new_colour, usr) -/obj/item/device/paint_sprayer/verb/choose_preset_colour() +/obj/item/paint_sprayer/verb/choose_preset_colour() set name = "Choose Preset Colour" set desc = "Choose a paintgun colour." set category = "Object.Held" @@ -337,7 +337,7 @@ update_icon() to_chat(usr, SPAN_NOTICE("You set \the [src] to paint with a new colour.")) -/obj/item/device/paint_sprayer/verb/choose_decal() +/obj/item/paint_sprayer/verb/choose_decal() set name = "Choose Decal" set desc = "Choose a paintgun decal." set category = "Object.Held" @@ -351,7 +351,7 @@ decal = new_decal to_chat(usr, SPAN_NOTICE("You set \the [src] decal to '[decal]'.")) -/obj/item/device/paint_sprayer/verb/choose_direction() +/obj/item/paint_sprayer/verb/choose_direction() set name = "Choose Direction" set desc = "Choose a paintgun direction." set category = "Object.Held" diff --git a/code/game/objects/items/devices/personal_shield.dm b/code/game/objects/items/devices/personal_shield.dm index 9bf06bc0e10..e25b8f5e0fa 100644 --- a/code/game/objects/items/devices/personal_shield.dm +++ b/code/game/objects/items/devices/personal_shield.dm @@ -1,4 +1,4 @@ -/obj/item/device/personal_shield +/obj/item/personal_shield name = "personal shield" desc = "Truely a life-saver: this device protects its user from being hit by objects moving very, very fast, though only for a few shots. Comes with a power cell and can be recharged in a recharger." icon = 'icons/obj/personal_shield.dmi' @@ -12,35 +12,35 @@ var/upkeep_cost = 2 var/obj/aura/personal_shield/device/shield -/obj/item/device/personal_shield/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/personal_shield/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(is_adjacent) . += "\The [src] has [cell.charge] charge remaining." . += "Shield upkeep costs [upkeep_cost] charge, and blocking a shot costs [charge_per_shot] charge." -/obj/item/device/personal_shield/Initialize() +/obj/item/personal_shield/Initialize() . = ..() cell = new(src) cell.charge = cell.maxcharge //1000 charge -/obj/item/device/personal_shield/Destroy() +/obj/item/personal_shield/Destroy() dissipate() STOP_PROCESSING(SSprocessing, src) QDEL_NULL(cell) return ..() -/obj/item/device/personal_shield/get_cell() +/obj/item/personal_shield/get_cell() return cell -/obj/item/device/personal_shield/process(seconds_per_tick) +/obj/item/personal_shield/process(seconds_per_tick) if(shield) if(!ismob(src.loc)) deactivate() return cell.use(upkeep_cost*seconds_per_tick) -/obj/item/device/personal_shield/attack_self(mob/living/user) +/obj/item/personal_shield/attack_self(mob/living/user) if(cell.charge && !shield) activate(user) else @@ -51,7 +51,7 @@ * * * user - The user that activated the shield */ -/obj/item/device/personal_shield/proc/activate(mob/living/user) +/obj/item/personal_shield/proc/activate(mob/living/user) if(cell.charge && !shield) shield = new /obj/aura/personal_shield/device(user) shield.added_to(user) @@ -67,7 +67,7 @@ * * * user - The user that deactivated the shield, if any */ -/obj/item/device/personal_shield/proc/deactivate(mob/living/user) +/obj/item/personal_shield/proc/deactivate(mob/living/user) if(shield) dissipate() user?.update_inv_belt() @@ -76,7 +76,7 @@ update_icon() -/obj/item/device/personal_shield/proc/take_charge() +/obj/item/personal_shield/proc/take_charge() cell.use(charge_per_shot) if(cell.percent() == 0) to_chat(shield.user, FONT_LARGE(SPAN_WARNING("\The [src] begins to spark as it breaks!"))) @@ -84,7 +84,7 @@ update_icon() return -/obj/item/device/personal_shield/update_icon() +/obj/item/personal_shield/update_icon() if(cell.charge && shield) icon_state = "[initial(icon_state)]_on" item_state = "[initial(item_state)]_on" @@ -92,7 +92,7 @@ icon_state = "[initial(icon_state)]" item_state = "[initial(item_state)]" -/obj/item/device/personal_shield/proc/dissipate() +/obj/item/personal_shield/proc/dissipate() if(shield?.user) to_chat(shield.user, FONT_LARGE(SPAN_WARNING("\The [src] fades around you, dissipating."))) QDEL_NULL(shield) diff --git a/code/game/objects/items/devices/pin_extractor.dm b/code/game/objects/items/devices/pin_extractor.dm index 6805b44c809..00f2e2166b2 100644 --- a/code/game/objects/items/devices/pin_extractor.dm +++ b/code/game/objects/items/devices/pin_extractor.dm @@ -1,7 +1,7 @@ -/obj/item/device/pin_extractor +/obj/item/pin_extractor name = "firing pin extractor" desc = "A device that is capable of removing firing pin without damaging it." - icon = 'icons/obj/item/device/pin_extractor.dmi' + icon = 'icons/obj/item/pin_extractor.dmi' icon_state = "pin_extractor" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL @@ -12,13 +12,13 @@ origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 4) -/obj/item/device/pin_extractor/update_icon() +/obj/item/pin_extractor/update_icon() if(on) icon_state = "[initial(icon_state)]-on" else icon_state = "[initial(icon_state)]" -/obj/item/device/pin_extractor/attack_self(mob/user) +/obj/item/pin_extractor/attack_self(mob/user) on = !on if(on && activation_sound) playsound(src.loc, activation_sound, 75, 1) @@ -26,7 +26,7 @@ user.update_action_buttons() return 1 -/obj/item/device/pin_extractor/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/pin_extractor/afterattack(atom/target, mob/user, proximity_flag) if(proximity_flag) if(istype(target, /obj/item/gun)) if(!on) diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 6e06da19231..b398ab9436a 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -1,23 +1,23 @@ -/obj/item/device/pipe_painter +/obj/item/pipe_painter name = "pipe painter" - icon = 'icons/obj/item/device/pipe_painter.dmi' + icon = 'icons/obj/item/pipe_painter.dmi' icon_state = "pipe_painter" item_state = "pipe_painter" var/list/modes var/mode -/obj/item/device/pipe_painter/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/pipe_painter/feedback_hints(mob/user, distance, is_adjacent) . += ..() . += "It is in [mode] mode." -/obj/item/device/pipe_painter/New() +/obj/item/pipe_painter/New() ..() modes = new() for(var/C in GLOB.pipe_colors) modes += "[C]" mode = pick(modes) -/obj/item/device/pipe_painter/afterattack(var/atom/A, var/mob/user, proximity) +/obj/item/pipe_painter/afterattack(var/atom/A, var/mob/user, proximity) if(!proximity) return if(!in_range(user, A)) @@ -31,5 +31,5 @@ var/obj/item/pipe/P = A P.color = GLOB.pipe_colors[mode] -/obj/item/device/pipe_painter/attack_self(var/mob/user) +/obj/item/pipe_painter/attack_self(var/mob/user) mode = tgui_input_list(user, "Which colour do you want to use?", "Pipe Painter", modes, mode) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 0fc172c18e5..30dbca6b355 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -1,9 +1,9 @@ // Powersink - used to drain station power -/obj/item/device/powersink +/obj/item/powersink name = "power sink" desc = "A nulling power sink which drains energy from electrical systems." - icon = 'icons/obj/item/device/powersink.dmi' + icon = 'icons/obj/item/powersink.dmi' icon_state = "powersink0" item_state = "powersink0" w_class = WEIGHT_CLASS_BULKY @@ -37,17 +37,17 @@ var/datum/powernet/PN // Our powernet var/obj/structure/cable/attached // the attached cable -/obj/item/device/powersink/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/powersink/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "Dead APCs means their emergency shutters won't automatically close pressure loss. You could rapidly vent an entire department this way." -/obj/item/device/powersink/Destroy() +/obj/item/powersink/Destroy() PN = null attached = null return ..() -/obj/item/device/powersink/attackby(obj/item/attacking_item, mob/user) +/obj/item/powersink/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) if(mode == 0) var/turf/T = loc @@ -76,17 +76,17 @@ else return ..() -/obj/item/device/powersink/attack_ai() +/obj/item/powersink/attack_ai() return -/obj/item/device/powersink/attack_hand(var/mob/user) +/obj/item/powersink/attack_hand(var/mob/user) if(!mode) ..() else toggle_mode(user) /// Used to be handled in attack_hand(), but moved to its own proc to handle future signaler usage. -/obj/item/device/powersink/proc/toggle_mode(var/mob/user) +/obj/item/powersink/proc/toggle_mode(var/mob/user) switch(mode) if(1) if(user) @@ -108,7 +108,7 @@ item_state = "powersink0" STOP_PROCESSING(SSprocessing, src) -/obj/item/device/powersink/proc/siphon_power(seconds_per_tick) +/obj/item/powersink/proc/siphon_power(seconds_per_tick) if(!attached) return 0 @@ -141,7 +141,7 @@ power_drained += drained return 1 -/obj/item/device/powersink/process(seconds_per_tick) +/obj/item/powersink/process(seconds_per_tick) drained_this_tick = 0 power_drained -= min(dissipation_rate, power_drained) @@ -160,7 +160,7 @@ siphon_power(seconds_per_tick) -/obj/item/device/powersink/proc/handle_overload() +/obj/item/powersink/proc/handle_overload() if (QDELETED(src)) return diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 5c95b7bd12c..d073fd10472 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_EMPTY(teleportbeacons) -/obj/item/device/radio/beacon +/obj/item/radio/beacon name = "tracking beacon" desc = "A sophisticated beacon with integrated bluespace circuitry, capable of being targetted by a teleportation hub for localized jumps." icon_state = "beacon" @@ -9,38 +9,38 @@ GLOBAL_LIST_EMPTY(teleportbeacons) var/code = "electronic" origin_tech = list(TECH_BLUESPACE = 1) -/obj/item/device/radio/beacon/Initialize() +/obj/item/radio/beacon/Initialize() . = ..() GLOB.teleportbeacons += src -/obj/item/device/radio/beacon/Destroy() +/obj/item/radio/beacon/Destroy() GLOB.teleportbeacons -= src return ..() -/obj/item/device/radio/beacon/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/radio/beacon/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(anchored) . += SPAN_NOTICE("It's been secured to the ground with anchoring screws.") -/obj/item/device/radio/beacon/attack_hand(mob/user) +/obj/item/radio/beacon/attack_hand(mob/user) if(anchored) return return ..() -/obj/item/device/radio/beacon/hear_talk() +/obj/item/radio/beacon/hear_talk() return -/obj/item/device/radio/beacon/send_hear() +/obj/item/radio/beacon/send_hear() return null -/obj/item/device/radio/beacon/attackby(obj/item/attacking_item, mob/user) +/obj/item/radio/beacon/attackby(obj/item/attacking_item, mob/user) if(isturf(loc) && attacking_item.tool_behaviour == TOOL_SCREWDRIVER) anchored = !anchored user.visible_message("[user] [anchored ? "" : "un"]fastens \the [src] [anchored ? "to" : "from"] the floor.", "You [anchored ? "" : "un"]fasten \the [src] [anchored ? "to" : "from"] the floor.") return return ..() -/obj/item/device/radio/beacon/verb/alter_signal(t as text) +/obj/item/radio/beacon/verb/alter_signal(t as text) set name = "Alter Beacon's Signal" set category = "Object.Held" set src in usr @@ -54,18 +54,18 @@ GLOBAL_LIST_EMPTY(teleportbeacons) // Probably a better way of doing this, I'm lazy. -/obj/item/device/radio/beacon/bacon/proc/digest_delay() +/obj/item/radio/beacon/bacon/proc/digest_delay() QDEL_IN(src, 600) -/obj/item/device/radio/beacon/fixed +/obj/item/radio/beacon/fixed alpha = 0 invisibility = INVISIBILITY_MAXIMUM anchored = TRUE -/obj/item/device/radio/beacon/fixed/ex_act(severity) +/obj/item/radio/beacon/fixed/ex_act(severity) return -/obj/item/device/radio/beacon/fixed/emp_act(severity) +/obj/item/radio/beacon/fixed/emp_act(severity) . = ..() return diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index c1d5b77c6bb..d68fbbc6cbd 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -1,4 +1,4 @@ -/obj/item/device/radio/electropack +/obj/item/radio/electropack name = "electropack" desc = "Dance my monkeys! DANCE!!!" icon_state = "electropack0" @@ -11,17 +11,17 @@ var/code = 2 -/obj/item/device/radio/electropack/Initialize() +/obj/item/radio/electropack/Initialize() . = ..() set_frequency(1449) -/obj/item/device/radio/electropack/attack_hand(mob/user as mob) +/obj/item/radio/electropack/attack_hand(mob/user as mob) if(src == user.back) to_chat(user, SPAN_NOTICE("You need help taking this off!")) return ..() -/obj/item/device/radio/electropack/Topic(href, href_list) +/obj/item/radio/electropack/Topic(href, href_list) //..() if(usr.stat || usr.restrained()) return @@ -59,7 +59,7 @@ return return -/obj/item/device/radio/electropack/receive_signal(datum/signal/signal) +/obj/item/radio/electropack/receive_signal(datum/signal/signal) if(!signal || signal.encryption != code) return @@ -80,14 +80,14 @@ master.receive_signal() return -/obj/item/device/radio/electropack/proc/update_move_recently() +/obj/item/radio/electropack/proc/update_move_recently() var/mob/M = loc if(M) M.moved_recently = 0 -/obj/item/device/radio/electropack/attack_self(mob/user as mob, flag1) +/obj/item/radio/electropack/attack_self(mob/user as mob, flag1) if(!istype(user, /mob/living/carbon/human)) return diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index deeee09f3ee..d55258aa19b 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -1,7 +1,7 @@ -/obj/item/device/encryptionkey +/obj/item/encryptionkey name = "standard encryption key" desc = "An encryption key for a radio headset. Contains cypherkeys." - icon = 'icons/obj/item/device/encryptionkey.dmi' + icon = 'icons/obj/item/encryptionkey.dmi' icon_state = "cypherkey" item_state = "" w_class = WEIGHT_CLASS_TINY @@ -13,14 +13,14 @@ var/list/channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE, CHANNEL_EXPED = TRUE) var/list/additional_channels = list() -/obj/item/device/encryptionkey/attackby(obj/item/attacking_item, mob/user) +/obj/item/encryptionkey/attackby(obj/item/attacking_item, mob/user) return -/obj/item/device/encryptionkey/ship +/obj/item/encryptionkey/ship var/use_common = FALSE channels = list() -/obj/item/device/encryptionkey/ship/Initialize() +/obj/item/encryptionkey/ship/Initialize() if(!SSatlas.current_map.use_overmap) return ..() @@ -48,56 +48,56 @@ return INITIALIZE_HINT_NORMAL -/obj/item/device/encryptionkey/ship/proc/get_sector_z() +/obj/item/encryptionkey/ship/proc/get_sector_z() . = GET_Z(get_turf(src)) -/obj/item/device/encryptionkey/ship/common +/obj/item/encryptionkey/ship/common use_common = TRUE -/obj/item/device/encryptionkey/ship/odyssey/get_sector_z() +/obj/item/encryptionkey/ship/odyssey/get_sector_z() if(SSodyssey.scenario_zlevels && SSodyssey.scenario_zlevels.len) . = SSodyssey.scenario_zlevels[1] else // safe fallback . = GET_Z(get_turf(src)) -/obj/item/device/encryptionkey/ship/coal_navy +/obj/item/encryptionkey/ship/coal_navy additional_channels = list(CHANNEL_COALITION_NAVY = TRUE) -/obj/item/device/encryptionkey/syndicate +/obj/item/encryptionkey/syndicate icon_state = "cypherkey" additional_channels = list(CHANNEL_MERCENARY = TRUE, CHANNEL_HAILING = TRUE) origin_tech = list(TECH_ILLEGAL = 3) syndie = TRUE -/obj/item/device/encryptionkey/syndicate/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/encryptionkey/syndicate/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "An encryption key that allows you to intercept comms and speak on private non-standard channels. Use :t to access the private channel." -/obj/item/device/encryptionkey/raider +/obj/item/encryptionkey/raider icon_state = "cypherkey" additional_channels = list(CHANNEL_RAIDER = TRUE, CHANNEL_HAILING = TRUE) origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE -/obj/item/device/encryptionkey/burglar +/obj/item/encryptionkey/burglar icon_state = "cypherkey" additional_channels = list(CHANNEL_BURGLAR = TRUE, CHANNEL_HAILING = TRUE) origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE -/obj/item/device/encryptionkey/jockey +/obj/item/encryptionkey/jockey icon_state = "cypherkey" additional_channels = list(CHANNEL_JOCKEY = TRUE, CHANNEL_HAILING = TRUE) origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE -/obj/item/device/encryptionkey/ninja +/obj/item/encryptionkey/ninja icon_state = "cypherkey" additional_channels = list(CHANNEL_NINJA = TRUE, CHANNEL_HAILING = TRUE) origin_tech = list(TECH_ILLEGAL = 3) syndie = TRUE -/obj/item/device/encryptionkey/bluespace +/obj/item/encryptionkey/bluespace name = "bluespace encryption key" desc = "A nonsensical mimicry of a standard encryption key, in the form of an elongated bluespace crystal. It seems to function." icon_state = "bs_cypherkey" @@ -105,158 +105,158 @@ origin_tech = list(TECH_BLUESPACE = 3) syndie = TRUE -/obj/item/device/encryptionkey/binary +/obj/item/encryptionkey/binary icon_state = "cypherkey" translate_binary = TRUE origin_tech = list(TECH_ILLEGAL = 3) -/obj/item/device/encryptionkey/hivenet +/obj/item/encryptionkey/hivenet name = "hivenet encryption chip" desc = "It appears to be a Vaurca Hivenet encryption chip, for localized broadcasts." translate_hivenet = TRUE icon = 'icons/obj/stock_parts.dmi' icon_state = "neuralchip" -/obj/item/device/encryptionkey/headset_sec +/obj/item/encryptionkey/headset_sec name = "security radio encryption key" icon_state = "sec_cypherkey" channels = list(CHANNEL_SECURITY = TRUE) -/obj/item/device/encryptionkey/headset_warden +/obj/item/encryptionkey/headset_warden name = "warden radio encryption key" icon_state = "sec_cypherkey" channels = list(CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE) -/obj/item/device/encryptionkey/headset_penal +/obj/item/encryptionkey/headset_penal name = "penal radio encryption key" icon_state = "cargo_cypherkey" channels = list(CHANNEL_PENAL = TRUE) -/obj/item/device/encryptionkey/headset_eng +/obj/item/encryptionkey/headset_eng name = "engineering radio encryption key" icon_state = "eng_cypherkey" channels = list(CHANNEL_ENGINEERING = TRUE) -/obj/item/device/encryptionkey/headset_rob +/obj/item/encryptionkey/headset_rob name = "robotics radio encryption key" icon_state = "rob_cypherkey" channels = list(CHANNEL_ENGINEERING = TRUE, CHANNEL_SCIENCE = TRUE) -/obj/item/device/encryptionkey/headset_med +/obj/item/encryptionkey/headset_med name = "medical radio encryption key" icon_state = "med_cypherkey" channels = list(CHANNEL_MEDICAL = TRUE) -/obj/item/device/encryptionkey/headset_sci +/obj/item/encryptionkey/headset_sci name = "science radio encryption key" icon_state = "sci_cypherkey" channels = list(CHANNEL_SCIENCE = TRUE) -/obj/item/device/encryptionkey/headset_xenology +/obj/item/encryptionkey/headset_xenology name = "xenology radio encryption key" icon_state = "sci_cypherkey" channels = list(CHANNEL_SCIENCE = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/headset_medsci +/obj/item/encryptionkey/headset_medsci name = "medical research radio encryption key" icon_state = "medsci_cypherkey" channels = list(CHANNEL_MEDICAL = TRUE, CHANNEL_SCIENCE = TRUE) -/obj/item/device/encryptionkey/headset_com +/obj/item/encryptionkey/headset_com name = "command radio encryption key" icon_state = "com_cypherkey" channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/captain +/obj/item/encryptionkey/heads/captain name = "captain's encryption key" icon_state = "cap_cypherkey" channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE, CHANNEL_ENGINEERING = TRUE, CHANNEL_SCIENCE = TRUE, CHANNEL_MEDICAL = TRUE, CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/ai_integrated +/obj/item/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE, CHANNEL_ENGINEERING = TRUE, CHANNEL_SCIENCE = TRUE, CHANNEL_MEDICAL = TRUE, CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_AI_PRIVATE = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/rd +/obj/item/encryptionkey/heads/rd name = "research director's encryption key" icon_state = "rd_cypherkey" channels = list(CHANNEL_SCIENCE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/hos +/obj/item/encryptionkey/heads/hos name = "head of security's encryption key" icon_state = "hos_cypherkey" channels = list(CHANNEL_SECURITY = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_PENAL = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/ce +/obj/item/encryptionkey/heads/ce name = "chief engineer's encryption key" icon_state = "ce_cypherkey" channels = list(CHANNEL_ENGINEERING = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/cmo +/obj/item/encryptionkey/heads/cmo name = "chief medical officer's encryption key" icon_state = "cmo_cypherkey" channels = list(CHANNEL_MEDICAL = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/heads/xo +/obj/item/encryptionkey/heads/xo name = "executive officer's encryption key" icon_state = "hop_cypherkey" channels = list(CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/headset_cargo +/obj/item/encryptionkey/headset_cargo name = "operations radio encryption key" icon_state = "cargo_cypherkey" channels = list(CHANNEL_SUPPLY = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/headset_operations_manager +/obj/item/encryptionkey/headset_operations_manager name = "operations manager radio encryption key" icon_state = "cargo_cypherkey" channels = list(CHANNEL_COMMAND = TRUE, CHANNEL_SUPPLY = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/headset_service +/obj/item/encryptionkey/headset_service name = "service radio encryption key" icon_state = "srv_cypherkey" channels = list(CHANNEL_SERVICE = TRUE) -/obj/item/device/encryptionkey/ert +/obj/item/encryptionkey/ert name = "\improper ERT radio encryption key" channels = list(CHANNEL_RESPONSE_TEAM = TRUE, CHANNEL_SCIENCE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_MEDICAL = TRUE, CHANNEL_ENGINEERING = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/onlyert +/obj/item/encryptionkey/onlyert name = "\improper ERT radio encryption key" channels = list(CHANNEL_RESPONSE_TEAM = TRUE, CHANNEL_HAILING = TRUE) -/obj/item/device/encryptionkey/rev +/obj/item/encryptionkey/rev name = "standard encryption key" desc = "An encryption key for a radio headset. Contains cypherkeys." additional_channels = list(CHANNEL_RAIDER = TRUE) origin_tech = list(TECH_ILLEGAL = 2) -/obj/item/device/encryptionkey/rev/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/encryptionkey/rev/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "An encryption key that allows you to intercept private comms speak on private non-ship channels. Use :x to access the private channel." -/obj/item/device/encryptionkey/eng_spare +/obj/item/encryptionkey/eng_spare name = "spare engineering radio encryption key" additional_channels = list(CHANNEL_ENGINEERING = TRUE) -/obj/item/device/encryptionkey/med_spare +/obj/item/encryptionkey/med_spare name = "spare medical radio encryption key" additional_channels = list(CHANNEL_MEDICAL = TRUE) -/obj/item/device/encryptionkey/sec_spare +/obj/item/encryptionkey/sec_spare name = "spare security radio encryption key" additional_channels = list(CHANNEL_SECURITY = TRUE) -/obj/item/device/encryptionkey/sci_spare +/obj/item/encryptionkey/sci_spare name = "spare science radio encryption key" additional_channels = list(CHANNEL_SCIENCE = TRUE) -/obj/item/device/encryptionkey/cargo_spare +/obj/item/encryptionkey/cargo_spare name = "spare operations radio encryption key" additional_channels = list(CHANNEL_SUPPLY = TRUE) -/obj/item/device/encryptionkey/service_spare +/obj/item/encryptionkey/service_spare name = "spare service radio encryption key" additional_channels = list(CHANNEL_SERVICE = TRUE) @@ -264,7 +264,7 @@ /obj/item/storage/box/fancy/keypouch name = "encryption key pouch" desc = "A pouch designed to store three encryption keys." - icon = 'icons/obj/item/device/encryptionkey.dmi' + icon = 'icons/obj/item/encryptionkey.dmi' icon_state = "keypouch0" icon_type = "key" storage_type = "pouch" @@ -272,7 +272,7 @@ closable = FALSE center_of_mass = list("x" = 16,"y" = 7) storage_slots = 3 - can_hold = list(/obj/item/device/encryptionkey) + can_hold = list(/obj/item/encryptionkey) starts_with = null /obj/item/storage/box/fancy/keypouch/Initialize() @@ -280,19 +280,19 @@ update_icon() /obj/item/storage/box/fancy/keypouch/eng - starts_with = list(/obj/item/device/encryptionkey/eng_spare = 3) + starts_with = list(/obj/item/encryptionkey/eng_spare = 3) /obj/item/storage/box/fancy/keypouch/med - starts_with = list(/obj/item/device/encryptionkey/med_spare = 3) + starts_with = list(/obj/item/encryptionkey/med_spare = 3) /obj/item/storage/box/fancy/keypouch/sec - starts_with = list(/obj/item/device/encryptionkey/sec_spare = 3) + starts_with = list(/obj/item/encryptionkey/sec_spare = 3) /obj/item/storage/box/fancy/keypouch/sci - starts_with = list(/obj/item/device/encryptionkey/sci_spare = 3) + starts_with = list(/obj/item/encryptionkey/sci_spare = 3) /obj/item/storage/box/fancy/keypouch/cargo - starts_with = list(/obj/item/device/encryptionkey/cargo_spare = 3) + starts_with = list(/obj/item/encryptionkey/cargo_spare = 3) /obj/item/storage/box/fancy/keypouch/service - starts_with = list(/obj/item/device/encryptionkey/service_spare = 3) + starts_with = list(/obj/item/encryptionkey/service_spare = 3) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 21dfbb9e4af..fb30e4db301 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -1,7 +1,7 @@ -/obj/item/device/radio/headset +/obj/item/radio/headset name = "radio headset" desc = "An updated, modular intercom that fits over the head. Takes encryption keys." - icon = 'icons/obj/item/device/radio/headset.dmi' + icon = 'icons/obj/item/radio/headset.dmi' icon_state = "headset" item_state = "headset" matter = list(MATERIAL_ALUMINIUM = 75) @@ -11,10 +11,10 @@ slot_flags = SLOT_EARS var/translate_binary = FALSE var/translate_hivenet = FALSE - var/obj/item/device/encryptionkey/keyslot1 = null - var/obj/item/device/encryptionkey/keyslot2 = null + var/obj/item/encryptionkey/keyslot1 = null + var/obj/item/encryptionkey/keyslot2 = null - var/ks1type = /obj/item/device/encryptionkey + var/ks1type = /obj/item/encryptionkey var/ks2type = null var/radio_sound = null @@ -23,7 +23,7 @@ drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' -/obj/item/device/radio/headset/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/radio/headset/feedback_hints(mob/user, distance, is_adjacent) . = list() . = ..() if(!(is_adjacent && radio_desc)) @@ -32,7 +32,7 @@ . += "The following channels are available:" . += radio_desc -/obj/item/device/radio/headset/Initialize() +/obj/item/radio/headset/Initialize() . = ..() internal_channels.Cut() if(ks1type) @@ -43,36 +43,36 @@ recalculateChannels(TRUE) possibly_deactivate_in_loc() -/obj/item/device/radio/headset/proc/possibly_deactivate_in_loc() +/obj/item/radio/headset/proc/possibly_deactivate_in_loc() if(ismob(loc)) set_listening(should_be_listening) else set_listening(FALSE, actual_setting = FALSE) -/obj/item/device/radio/headset/Destroy() +/obj/item/radio/headset/Destroy() QDEL_NULL(keyslot1) QDEL_NULL(keyslot2) return ..() -/obj/item/device/radio/headset/Moved(atom/old_loc, forced) +/obj/item/radio/headset/Moved(atom/old_loc, forced) . = ..() possibly_deactivate_in_loc() -/obj/item/device/radio/headset/set_listening(new_listening, actual_setting = TRUE) +/obj/item/radio/headset/set_listening(new_listening, actual_setting = TRUE) . = ..() if(listening && on) recalculateChannels() -/obj/item/device/radio/headset/list_channels(var/mob/user) +/obj/item/radio/headset/list_channels(var/mob/user) return list_secure_channels() -/obj/item/device/radio/headset/setupRadioDescription() +/obj/item/radio/headset/setupRadioDescription() if(translate_binary || translate_hivenet) ..(", :+ - Special") else ..() -/obj/item/device/radio/headset/handle_message_mode(mob/living/M, message, channel) +/obj/item/radio/headset/handle_message_mode(mob/living/M, message, channel) if(channel == "special") if(translate_binary) var/datum/language/binary = GLOB.all_languages[LANGUAGE_ROBOT] @@ -84,7 +84,7 @@ return ..() -/obj/item/device/radio/headset/can_receive(input_frequency, level, aiOverride = FALSE) +/obj/item/radio/headset/can_receive(input_frequency, level, aiOverride = FALSE) if (aiOverride) return ..(input_frequency, level) if(ishuman(src.loc)) @@ -95,7 +95,7 @@ return ..(input_frequency, level) return FALSE -/obj/item/device/radio/headset/attack_hand(mob/user) +/obj/item/radio/headset/attack_hand(mob/user) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.l_ear != src && H.r_ear != src) @@ -107,7 +107,7 @@ ..() -/obj/item/device/radio/headset/attackby(obj/item/attacking_item, mob/user) +/obj/item/radio/headset/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) if(keyslot1 || keyslot2) for(var/ch_name in channels) @@ -131,7 +131,7 @@ else to_chat(user, SPAN_WARNING("This headset doesn't have any encryption keys!")) - else if(istype(attacking_item, /obj/item/device/encryptionkey)) + else if(istype(attacking_item, /obj/item/encryptionkey)) if(keyslot1 && keyslot2) to_chat(user, SPAN_WARNING("The headset can't hold another key!")) return @@ -146,7 +146,7 @@ recalculateChannels(TRUE) -/obj/item/device/radio/headset/proc/recalculateChannels(var/setDescription = FALSE) +/obj/item/radio/headset/proc/recalculateChannels(var/setDescription = FALSE) var/list/old_channel_settings = channels.Copy() channels = list() translate_binary = FALSE @@ -158,7 +158,7 @@ for(var/keyslot in list(keyslot1, keyslot2)) if(!keyslot) continue - var/obj/item/device/encryptionkey/K = keyslot + var/obj/item/encryptionkey/K = keyslot for(var/ch_name in K.channels) if(ch_name in channels) @@ -192,29 +192,29 @@ return -/obj/item/device/radio/headset/alt +/obj/item/radio/headset/alt name = "bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double +/obj/item/radio/headset/alt/double name = "soundproof headset" desc = "A sound isolating version of the common radio headset." - icon = 'icons/obj/item/device/radio/headset_alt_double.dmi' + icon = 'icons/obj/item/radio/headset_alt_double.dmi' icon_state = "earset" item_state = "earset" item_flags = ITEM_FLAG_SOUND_PROTECTION slot_flags = SLOT_EARS | SLOT_TWOEARS -/obj/item/device/radio/headset/alt/double/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/radio/headset/alt/double/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "This radio doubles as a pair of earmuffs by providing sound protection." -/obj/item/device/radio/headset/wrist +/obj/item/radio/headset/wrist name = "wristbound radio" desc = "A radio designed to fit on the wrist. Often known for broadcasting loudly enough that those closeby might overhear it." - icon = 'icons/obj/item/device/radio/headset_wrist.dmi' + icon = 'icons/obj/item/radio/headset_wrist.dmi' icon_state = "wristset" item_state = "wristset" slot_flags = SLOT_WRISTS @@ -222,11 +222,11 @@ var/mob_wear_layer = ABOVE_SUIT_LAYER_WR EarSound = FALSE -/obj/item/device/radio/headset/wrist/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/radio/headset/wrist/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "This radio can be heard by people standing next to the one wearing it." -/obj/item/device/radio/headset/wrist/verb/change_layer() +/obj/item/radio/headset/wrist/verb/change_layer() set category = "Object.Equipped" set name = "Change Wrist Layer" set src in usr @@ -246,15 +246,15 @@ H.update_inv_r_ear() -/obj/item/device/radio/headset/wrist/clip +/obj/item/radio/headset/wrist/clip name = "clip-on radio" desc = "A radio designed to clip onto your clothes. Often known for broadcasting loudly enough that those closeby might overhear it." - icon = 'icons/obj/item/device/radio/headset_clip.dmi' + icon = 'icons/obj/item/radio/headset_clip.dmi' icon_state = "clip" item_state = "clip" slot_flags = SLOT_WRISTS | SLOT_EARS -/obj/item/device/radio/headset/wrist/clip/verb/flip_radio() +/obj/item/radio/headset/wrist/clip/verb/flip_radio() set category = "Object.Equipped" set name = "Flip Radio" set src in usr @@ -273,12 +273,12 @@ else if(H.r_ear == src) H.update_inv_r_ear() -/obj/item/device/radio/headset/wrist/clip/get_wrist_examine_text(mob/living/carbon/human/user) +/obj/item/radio/headset/wrist/clip/get_wrist_examine_text(mob/living/carbon/human/user) if(!istype(user)) return ..() return "clipped to [user.get_pronoun("his")] [(mob_wear_layer == ABOVE_SUIT_LAYER_WR) && user.wear_suit ? user.wear_suit.name : user.w_uniform ? user.w_uniform.name : "chest"]" -/obj/item/device/radio/headset/wrist/clip/get_ear_examine_text(mob/living/carbon/human/user) +/obj/item/radio/headset/wrist/clip/get_ear_examine_text(mob/living/carbon/human/user) if(!istype(user)) return ..() return "clipped to [user.get_pronoun("his")] [user.wear_suit ? user.wear_suit.name : user.w_uniform ? user.w_uniform.name : "chest"]" @@ -287,587 +287,587 @@ * Civillian */ -/obj/item/device/radio/headset/headset_service +/obj/item/radio/headset/headset_service name = "service radio headset" desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean." icon_state = "srv_headset" item_state = "srv_headset" - ks2type = /obj/item/device/encryptionkey/headset_service + ks2type = /obj/item/encryptionkey/headset_service -/obj/item/device/radio/headset/headset_service/alt +/obj/item/radio/headset/headset_service/alt name = "service radio bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "srv_headset_alt" item_state = "srv_headset_alt" -/obj/item/device/radio/headset/alt/double/service +/obj/item/radio/headset/alt/double/service name = "soundproof service headset" icon_state = "earset_srv" item_state = "earset_srv" - ks2type = /obj/item/device/encryptionkey/headset_service + ks2type = /obj/item/encryptionkey/headset_service -/obj/item/device/radio/headset/wrist/service +/obj/item/radio/headset/wrist/service name = "wristbound service radio" icon_state = "wristset_srv" item_state = "wristset_srv" - ks2type = /obj/item/device/encryptionkey/headset_service + ks2type = /obj/item/encryptionkey/headset_service -/obj/item/device/radio/headset/wrist/clip/service +/obj/item/radio/headset/wrist/clip/service name = "clip-on service radio" icon_state = "clip_srv" item_state = "clip_srv" - ks2type = /obj/item/device/encryptionkey/headset_service + ks2type = /obj/item/encryptionkey/headset_service -/obj/item/device/radio/headset/heads/xo +/obj/item/radio/headset/heads/xo name = "executive officer's headset" desc = "The headset of the guy who will one day be captain." icon_state = "hop_headset" - ks2type = /obj/item/device/encryptionkey/heads/xo + ks2type = /obj/item/encryptionkey/heads/xo -/obj/item/device/radio/headset/heads/xo/alt +/obj/item/radio/headset/heads/xo/alt name = "executive officer's bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "hop_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/xo +/obj/item/radio/headset/alt/double/xo name = "executive officer's soundproof headset" icon_state = "earset_HoP" item_state = "earset_HoP" - ks2type = /obj/item/device/encryptionkey/heads/xo + ks2type = /obj/item/encryptionkey/heads/xo -/obj/item/device/radio/headset/wrist/xo +/obj/item/radio/headset/wrist/xo name = "executive officer's wristbound radio" icon_state = "wristset_HoP" item_state = "wristset_HoP" - ks2type = /obj/item/device/encryptionkey/heads/xo + ks2type = /obj/item/encryptionkey/heads/xo -/obj/item/device/radio/headset/wrist/clip/xo +/obj/item/radio/headset/wrist/clip/xo name = "executive officer's clip-on radio" icon_state = "clip_HoP" item_state = "clip_HoP" - ks2type = /obj/item/device/encryptionkey/heads/xo + ks2type = /obj/item/encryptionkey/heads/xo /* * Engineering */ -/obj/item/device/radio/headset/headset_eng +/obj/item/radio/headset/headset_eng name = "engineering radio headset" desc = "When the engineers wish to chat like girls." icon_state = "eng_headset" - ks2type = /obj/item/device/encryptionkey/headset_eng + ks2type = /obj/item/encryptionkey/headset_eng -/obj/item/device/radio/headset/headset_eng/alt +/obj/item/radio/headset/headset_eng/alt name = "engineering bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "eng_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/eng +/obj/item/radio/headset/alt/double/eng name = "soundproof engineering headset" icon_state = "earset_eng" item_state = "earset_eng" - ks2type = /obj/item/device/encryptionkey/headset_eng + ks2type = /obj/item/encryptionkey/headset_eng -/obj/item/device/radio/headset/wrist/eng +/obj/item/radio/headset/wrist/eng name = "wristbound engineering radio" icon_state = "wristset_eng" item_state = "wristset_eng" - ks2type = /obj/item/device/encryptionkey/headset_eng + ks2type = /obj/item/encryptionkey/headset_eng -/obj/item/device/radio/headset/wrist/clip/eng +/obj/item/radio/headset/wrist/clip/eng name = "clip-on engineering radio" icon_state = "clip_eng" item_state = "clip_eng" - ks2type = /obj/item/device/encryptionkey/headset_eng + ks2type = /obj/item/encryptionkey/headset_eng -/obj/item/device/radio/headset/heads/ce +/obj/item/radio/headset/heads/ce name = "chief engineer's headset" desc = "The headset of the guy who is in charge of morons." icon_state = "ce_headset" - ks2type = /obj/item/device/encryptionkey/heads/ce + ks2type = /obj/item/encryptionkey/heads/ce -/obj/item/device/radio/headset/heads/ce/alt +/obj/item/radio/headset/heads/ce/alt name = "chief engineer's bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "ce_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/ce +/obj/item/radio/headset/alt/double/ce name = "chief engineer's soundproof headset" icon_state = "earset_CE" item_state = "earset_CE" - ks2type = /obj/item/device/encryptionkey/heads/ce + ks2type = /obj/item/encryptionkey/heads/ce -/obj/item/device/radio/headset/wrist/ce +/obj/item/radio/headset/wrist/ce name = "chief engineer's wristbound radio" icon_state = "wristset_CE" item_state = "wristset_CE" - ks2type = /obj/item/device/encryptionkey/heads/ce + ks2type = /obj/item/encryptionkey/heads/ce -/obj/item/device/radio/headset/wrist/clip/ce +/obj/item/radio/headset/wrist/clip/ce name = "chief engineer's clip-on radio" icon_state = "clip_CE" item_state = "clip_CE" - ks2type = /obj/item/device/encryptionkey/heads/ce + ks2type = /obj/item/encryptionkey/heads/ce /* * Cargo */ -/obj/item/device/radio/headset/headset_cargo +/obj/item/radio/headset/headset_cargo name = "supply radio headset" desc = "A headset used by the operations manager's slaves." icon_state = "cargo_headset" - ks2type = /obj/item/device/encryptionkey/headset_cargo + ks2type = /obj/item/encryptionkey/headset_cargo -/obj/item/device/radio/headset/headset_cargo/alt +/obj/item/radio/headset/headset_cargo/alt name = "cargo bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "cargo_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/cargo +/obj/item/radio/headset/alt/double/cargo name = "soundproof cargo headset" icon_state = "earset_cargo" item_state = "earset_cargo" - ks2type = /obj/item/device/encryptionkey/headset_cargo + ks2type = /obj/item/encryptionkey/headset_cargo -/obj/item/device/radio/headset/wrist/cargo +/obj/item/radio/headset/wrist/cargo name = "wristbound cargo radio" icon_state = "wristset_cargo" item_state = "wristset_cargo" - ks2type = /obj/item/device/encryptionkey/headset_cargo + ks2type = /obj/item/encryptionkey/headset_cargo -/obj/item/device/radio/headset/wrist/clip/cargo +/obj/item/radio/headset/wrist/clip/cargo name = "clip-on cargo radio" icon_state = "clip_cargo" item_state = "clip_cargo" - ks2type = /obj/item/device/encryptionkey/headset_cargo + ks2type = /obj/item/encryptionkey/headset_cargo -/obj/item/device/radio/headset/headset_mining +/obj/item/radio/headset/headset_mining name = "mining radio headset" desc = "Headset used by dwarves. It has an inbuilt subspace antenna for better reception." icon_state = "mine_headset" - ks2type = /obj/item/device/encryptionkey/headset_cargo + ks2type = /obj/item/encryptionkey/headset_cargo -/obj/item/device/radio/headset/headset_mining/alt +/obj/item/radio/headset/headset_mining/alt name = "mining bowman radio headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "mine_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/mining +/obj/item/radio/headset/alt/double/mining name = "soundproof mining headset" icon_state = "earset_mine" item_state = "earset_mine" - ks2type = /obj/item/device/encryptionkey/headset_cargo + ks2type = /obj/item/encryptionkey/headset_cargo -/obj/item/device/radio/headset/wrist/cargo/mining +/obj/item/radio/headset/wrist/cargo/mining name = "wristbound mining radio" icon_state = "wristset_mine" item_state = "wristset_mine" -/obj/item/device/radio/headset/wrist/clip/cargo/mining +/obj/item/radio/headset/wrist/clip/cargo/mining name = "clip-on mining radio" icon_state = "clip_mine" item_state = "clip_mine" -/obj/item/device/radio/headset/operations_manager +/obj/item/radio/headset/operations_manager name = "operations manager's headset" desc = "A headset used by the head honcho of paper pushing." icon_state = "qm_headset" - ks2type = /obj/item/device/encryptionkey/headset_operations_manager + ks2type = /obj/item/encryptionkey/headset_operations_manager -/obj/item/device/radio/headset/operations_manager/alt +/obj/item/radio/headset/operations_manager/alt name = "operations manager bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "qm_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/operations_manager +/obj/item/radio/headset/alt/double/operations_manager name = "soundproof operations manager headset" icon_state = "earset_QM" item_state = "earset_QM" - ks2type = /obj/item/device/encryptionkey/headset_operations_manager + ks2type = /obj/item/encryptionkey/headset_operations_manager -/obj/item/device/radio/headset/wrist/cargo/operations_manager +/obj/item/radio/headset/wrist/cargo/operations_manager name = "wristbound operations manager radio" icon_state = "wristset_QM" item_state = "wristset_QM" - ks2type = /obj/item/device/encryptionkey/headset_operations_manager + ks2type = /obj/item/encryptionkey/headset_operations_manager -/obj/item/device/radio/headset/wrist/clip/cargo/operations_manager +/obj/item/radio/headset/wrist/clip/cargo/operations_manager name = "clip-on operations manager radio" icon_state = "clip_QM" item_state = "clip_QM" - ks2type = /obj/item/device/encryptionkey/headset_operations_manager + ks2type = /obj/item/encryptionkey/headset_operations_manager /* * Medical */ -/obj/item/device/radio/headset/headset_med +/obj/item/radio/headset/headset_med name = "medical radio headset" desc = "A headset for the trained staff of the medbay." icon_state = "med_headset" - ks2type = /obj/item/device/encryptionkey/headset_med + ks2type = /obj/item/encryptionkey/headset_med -/obj/item/device/radio/headset/headset_med/alt +/obj/item/radio/headset/headset_med/alt name = "medical bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "med_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/med +/obj/item/radio/headset/alt/double/med name = "soundproof medical headset" icon_state = "earset_med" item_state = "earset_med" - ks2type = /obj/item/device/encryptionkey/headset_med + ks2type = /obj/item/encryptionkey/headset_med -/obj/item/device/radio/headset/wrist/med +/obj/item/radio/headset/wrist/med name = "wristbound medical radio" icon_state = "wristset_med" item_state = "wristset_med" - ks2type = /obj/item/device/encryptionkey/headset_med + ks2type = /obj/item/encryptionkey/headset_med -/obj/item/device/radio/headset/wrist/clip/med +/obj/item/radio/headset/wrist/clip/med name = "clip-on medical radio" icon_state = "clip_med" item_state = "clip_med" - ks2type = /obj/item/device/encryptionkey/headset_med + ks2type = /obj/item/encryptionkey/headset_med -/obj/item/device/radio/headset/heads/cmo +/obj/item/radio/headset/heads/cmo name = "chief medical officer's headset" desc = "The headset of the highly trained medical chief." icon_state = "cmo_headset" - ks2type = /obj/item/device/encryptionkey/heads/cmo + ks2type = /obj/item/encryptionkey/heads/cmo -/obj/item/device/radio/headset/heads/cmo/alt +/obj/item/radio/headset/heads/cmo/alt name = "chief medical officer's bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "cmo_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/cmo +/obj/item/radio/headset/alt/double/cmo name = "chief medical officer's soundproof headset" icon_state = "earset_CMO" item_state = "earset_CMO" - ks2type = /obj/item/device/encryptionkey/heads/cmo + ks2type = /obj/item/encryptionkey/heads/cmo -/obj/item/device/radio/headset/wrist/cmo +/obj/item/radio/headset/wrist/cmo name = "chief medical officer's wristbound radio" icon_state = "wristset_CMO" item_state = "wristset_CMO" - ks2type = /obj/item/device/encryptionkey/heads/cmo + ks2type = /obj/item/encryptionkey/heads/cmo -/obj/item/device/radio/headset/wrist/clip/cmo +/obj/item/radio/headset/wrist/clip/cmo name = "chief medical officer's clip-on radio" icon_state = "clip_CMO" item_state = "clip_CMO" - ks2type = /obj/item/device/encryptionkey/heads/cmo + ks2type = /obj/item/encryptionkey/heads/cmo /* * Science */ -/obj/item/device/radio/headset/headset_sci +/obj/item/radio/headset/headset_sci name = "science radio headset" desc = "A science-y headset. Like usual." icon_state = "sci_headset" - ks2type = /obj/item/device/encryptionkey/headset_sci + ks2type = /obj/item/encryptionkey/headset_sci -/obj/item/device/radio/headset/headset_sci/alt +/obj/item/radio/headset/headset_sci/alt name = "science bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "sci_headset_alt" -/obj/item/device/radio/headset/alt/double/sci +/obj/item/radio/headset/alt/double/sci name = "soundproof science headset" icon_state = "earset_sci" item_state = "earset_sci" - ks2type = /obj/item/device/encryptionkey/headset_sci + ks2type = /obj/item/encryptionkey/headset_sci -/obj/item/device/radio/headset/wrist/sci +/obj/item/radio/headset/wrist/sci name = "wristbound science radio" icon_state = "wristset_sci" item_state = "wristset_sci" - ks2type = /obj/item/device/encryptionkey/headset_sci + ks2type = /obj/item/encryptionkey/headset_sci -/obj/item/device/radio/headset/wrist/clip/sci +/obj/item/radio/headset/wrist/clip/sci name = "clip-on science radio" icon_state = "clip_sci" item_state = "clip_sci" - ks2type = /obj/item/device/encryptionkey/headset_sci + ks2type = /obj/item/encryptionkey/headset_sci -/obj/item/device/radio/headset/headset_xenology +/obj/item/radio/headset/headset_xenology name = "xenologist radio headset" desc = "A science-y headset for Xenologists." icon_state = "sci_headset" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/headset_xenology/alt +/obj/item/radio/headset/headset_xenology/alt name = "xenologist bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "sci_headset_alt" -/obj/item/device/radio/headset/alt/double/xenology +/obj/item/radio/headset/alt/double/xenology name = "soundproof xenologist headset" icon_state = "earset_sci" item_state = "earset_sci" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/wrist/xenology +/obj/item/radio/headset/wrist/xenology name = "wristbound xenologist radio" icon_state = "wristset_sci" item_state = "wristset_sci" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/wrist/clip/xenology +/obj/item/radio/headset/wrist/clip/xenology name = "clip-on xenologist radio" icon_state = "clip_sci" item_state = "clip_sci" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/headset_anom +/obj/item/radio/headset/headset_anom name = "anomalist radio headset" desc = "A science-y headset for Anomalists." icon_state = "sci_headset" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/headset_anom/alt +/obj/item/radio/headset/headset_anom/alt name = "anomalist bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "sci_headset_alt" -/obj/item/device/radio/headset/alt/double/anom +/obj/item/radio/headset/alt/double/anom name = "soundproof anomalist headset" icon_state = "earset_sci" item_state = "earset_sci" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/wrist/anom +/obj/item/radio/headset/wrist/anom name = "wristbound anomalist radio" icon_state = "wristset_sci" item_state = "wristset_sci" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/wrist/clip/anom +/obj/item/radio/headset/wrist/clip/anom name = "clip-on anomalist radio" icon_state = "clip_sci" item_state = "clip_sci" - ks2type = /obj/item/device/encryptionkey/headset_xenology + ks2type = /obj/item/encryptionkey/headset_xenology -/obj/item/device/radio/headset/headset_rob +/obj/item/radio/headset/headset_rob name = "robotics radio headset" desc = "Made specifically for the roboticists who cannot decide between departments." icon_state = "rob_headset" - ks2type = /obj/item/device/encryptionkey/headset_rob + ks2type = /obj/item/encryptionkey/headset_rob -/obj/item/device/radio/headset/heads/rd +/obj/item/radio/headset/heads/rd name = "research director's headset" desc = "Headset of the researching God." icon_state = "rd_headset" - ks2type = /obj/item/device/encryptionkey/heads/rd + ks2type = /obj/item/encryptionkey/heads/rd -/obj/item/device/radio/headset/heads/rd/alt +/obj/item/radio/headset/heads/rd/alt name = "research director's bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "rd_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/rd +/obj/item/radio/headset/alt/double/rd name = "soundproof research director's headset" icon_state = "earset_RD" item_state = "earset_RD" - ks2type = /obj/item/device/encryptionkey/heads/rd + ks2type = /obj/item/encryptionkey/heads/rd -/obj/item/device/radio/headset/wrist/rd +/obj/item/radio/headset/wrist/rd name = "research director's wristbound radio" icon_state = "wristset_RD" item_state = "wristset_RD" - ks2type = /obj/item/device/encryptionkey/heads/rd + ks2type = /obj/item/encryptionkey/heads/rd -/obj/item/device/radio/headset/wrist/clip/rd +/obj/item/radio/headset/wrist/clip/rd name = "research director's clip-on radio" icon_state = "clip_RD" item_state = "clip_RD" - ks2type = /obj/item/device/encryptionkey/heads/rd + ks2type = /obj/item/encryptionkey/heads/rd /* * Security */ -/obj/item/device/radio/headset/headset_sec +/obj/item/radio/headset/headset_sec name = "security radio headset" desc = "This is used by your elite security force." icon_state = "sec_headset" - ks2type = /obj/item/device/encryptionkey/headset_sec + ks2type = /obj/item/encryptionkey/headset_sec -/obj/item/device/radio/headset/headset_sec/alt +/obj/item/radio/headset/headset_sec/alt name = "security bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "sec_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/sec +/obj/item/radio/headset/alt/double/sec name = "soundproof security headset" icon_state = "earset_sec" item_state = "earset_sec" - ks2type = /obj/item/device/encryptionkey/headset_sec + ks2type = /obj/item/encryptionkey/headset_sec -/obj/item/device/radio/headset/wrist/sec +/obj/item/radio/headset/wrist/sec name = "wristbound security radio" icon_state = "wristset_sec" item_state = "wristset_sec" - ks2type = /obj/item/device/encryptionkey/headset_sec + ks2type = /obj/item/encryptionkey/headset_sec -/obj/item/device/radio/headset/wrist/clip/sec +/obj/item/radio/headset/wrist/clip/sec name = "clip-on security radio" icon_state = "clip_sec" item_state = "clip_sec" - ks2type = /obj/item/device/encryptionkey/headset_sec + ks2type = /obj/item/encryptionkey/headset_sec -/obj/item/device/radio/headset/headset_warden +/obj/item/radio/headset/headset_warden name = "warden radio headset" desc = "This is used by your all-powerful overseer." icon_state = "sec_headset" - ks2type = /obj/item/device/encryptionkey/headset_warden + ks2type = /obj/item/encryptionkey/headset_warden -/obj/item/device/radio/headset/headset_warden/alt +/obj/item/radio/headset/headset_warden/alt name = "warden bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "sec_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/sec/warden +/obj/item/radio/headset/alt/double/sec/warden name = "soundproof warden headset" - ks2type = /obj/item/device/encryptionkey/headset_warden + ks2type = /obj/item/encryptionkey/headset_warden -/obj/item/device/radio/headset/wrist/sec/warden +/obj/item/radio/headset/wrist/sec/warden name = "wristbound warden radio" - ks2type = /obj/item/device/encryptionkey/headset_warden + ks2type = /obj/item/encryptionkey/headset_warden -/obj/item/device/radio/headset/wrist/clip/sec/warden +/obj/item/radio/headset/wrist/clip/sec/warden name = "clip-on warden radio" - ks2type = /obj/item/device/encryptionkey/headset_warden + ks2type = /obj/item/encryptionkey/headset_warden -/obj/item/device/radio/headset/headset_penal +/obj/item/radio/headset/headset_penal name = "penal radio headset" desc = "A headset used by people who have chosen or been chosen to work the fields." icon_state = "mine_headset" - ks2type = /obj/item/device/encryptionkey/headset_penal + ks2type = /obj/item/encryptionkey/headset_penal -/obj/item/device/radio/headset/heads/hos +/obj/item/radio/headset/heads/hos name = "head of security's headset" desc = "The headset of the man who protects your worthless lifes." icon_state = "hos_headset" - ks2type = /obj/item/device/encryptionkey/heads/hos + ks2type = /obj/item/encryptionkey/heads/hos -/obj/item/device/radio/headset/heads/hos/alt +/obj/item/radio/headset/heads/hos/alt name = "head of security's bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "hos_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/hos +/obj/item/radio/headset/alt/double/hos name = "head of security's soundproof headset" icon_state = "earset_HoS" item_state = "earset_HoS" - ks2type = /obj/item/device/encryptionkey/heads/hos + ks2type = /obj/item/encryptionkey/heads/hos -/obj/item/device/radio/headset/wrist/hos +/obj/item/radio/headset/wrist/hos name = "head of security's wristbound radio" icon_state = "wristset_HoS" item_state = "wristset_HoS" - ks2type = /obj/item/device/encryptionkey/heads/hos + ks2type = /obj/item/encryptionkey/heads/hos -/obj/item/device/radio/headset/wrist/clip/hos +/obj/item/radio/headset/wrist/clip/hos name = "head of security's clip-on radio" icon_state = "clip_HoS" item_state = "clip_HoS" - ks2type = /obj/item/device/encryptionkey/heads/hos + ks2type = /obj/item/encryptionkey/heads/hos /* * Captain */ -/obj/item/device/radio/headset/headset_com +/obj/item/radio/headset/headset_com name = "command radio headset" desc = "A headset with a commanding channel." icon_state = "com_headset" - ks2type = /obj/item/device/encryptionkey/headset_com + ks2type = /obj/item/encryptionkey/headset_com -/obj/item/device/radio/headset/headset_com/alt +/obj/item/radio/headset/headset_com/alt name = "command bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/command +/obj/item/radio/headset/alt/double/command name = "soundproof command headset" icon_state = "earset_com" item_state = "earset_com" - ks2type = /obj/item/device/encryptionkey/headset_com + ks2type = /obj/item/encryptionkey/headset_com -/obj/item/device/radio/headset/wrist/command +/obj/item/radio/headset/wrist/command name = "wristbound command radio" icon_state = "wristset_com" item_state = "wristset_com" - ks2type = /obj/item/device/encryptionkey/headset_com + ks2type = /obj/item/encryptionkey/headset_com -/obj/item/device/radio/headset/wrist/clip/command +/obj/item/radio/headset/wrist/clip/command name = "clip-on command radio" icon_state = "clip_com" item_state = "clip_com" - ks2type = /obj/item/device/encryptionkey/headset_com + ks2type = /obj/item/encryptionkey/headset_com -/obj/item/device/radio/headset/heads/captain +/obj/item/radio/headset/heads/captain name = "captain's headset" desc = "The headset of the boss." icon_state = "cap_headset" - ks2type = /obj/item/device/encryptionkey/heads/captain + ks2type = /obj/item/encryptionkey/heads/captain -/obj/item/device/radio/headset/heads/captain/alt +/obj/item/radio/headset/heads/captain/alt name = "captain's bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "cap_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/captain +/obj/item/radio/headset/alt/double/captain name = "captain's soundproof headset" icon_state = "earset_cap" item_state = "earset_cap" - ks2type = /obj/item/device/encryptionkey/heads/captain + ks2type = /obj/item/encryptionkey/heads/captain -/obj/item/device/radio/headset/wrist/captain +/obj/item/radio/headset/wrist/captain name = "captain's wristbound radio" icon_state = "wristset_cap" item_state = "wristset_cap" - ks2type = /obj/item/device/encryptionkey/heads/captain + ks2type = /obj/item/encryptionkey/heads/captain -/obj/item/device/radio/headset/wrist/clip/captain +/obj/item/radio/headset/wrist/clip/captain name = "captain's clip-on radio" icon_state = "clip_cap" item_state = "clip_cap" - ks2type = /obj/item/device/encryptionkey/heads/captain + ks2type = /obj/item/encryptionkey/heads/captain /* * Misc */ -/obj/item/device/radio/headset/headset_medsci +/obj/item/radio/headset/headset_medsci name = "medical research radio headset" desc = "A headset that is a result of the mating between medical and science." icon_state = "medsci_headset" - ks2type = /obj/item/device/encryptionkey/headset_medsci + ks2type = /obj/item/encryptionkey/headset_medsci -/obj/item/device/radio/headset/hivenet +/obj/item/radio/headset/hivenet translate_hivenet = 1 - ks2type = /obj/item/device/encryptionkey/hivenet + ks2type = /obj/item/encryptionkey/hivenet -/obj/item/device/radio/headset/earmuff +/obj/item/radio/headset/earmuff name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." icon = 'icons/obj/clothing/ears/earmuffs.dmi' @@ -876,64 +876,64 @@ item_flags = ITEM_FLAG_SOUND_PROTECTION slot_flags = SLOT_EARS | SLOT_TWOEARS -/obj/item/device/radio/headset/earmuff/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/radio/headset/earmuff/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "This set of earmuffs has a secret compartment housing radio gear, allowing it to function as a standard headset." -/obj/item/device/radio/headset/syndicate +/obj/item/radio/headset/syndicate name = "military headset" icon_state = "syn_headset" origin_tech = list(TECH_ILLEGAL = 3) syndie = TRUE - ks1type = /obj/item/device/encryptionkey/syndicate + ks1type = /obj/item/encryptionkey/syndicate -/obj/item/device/radio/headset/syndicate/alt +/obj/item/radio/headset/syndicate/alt name = "military bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "syn_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/raider +/obj/item/radio/headset/raider icon_state = "syn_headset" origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE - ks1type = /obj/item/device/encryptionkey/raider + ks1type = /obj/item/encryptionkey/raider -/obj/item/device/radio/headset/burglar +/obj/item/radio/headset/burglar icon_state = "syn_headset" origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE - ks1type = /obj/item/device/encryptionkey/burglar + ks1type = /obj/item/encryptionkey/burglar -/obj/item/device/radio/headset/jockey +/obj/item/radio/headset/jockey icon_state = "syn_headset" origin_tech = list(TECH_ILLEGAL = 2) syndie = TRUE - ks1type = /obj/item/device/encryptionkey/jockey + ks1type = /obj/item/encryptionkey/jockey -/obj/item/device/radio/headset/ninja +/obj/item/radio/headset/ninja icon_state = "syn_headset" origin_tech = list(TECH_ILLEGAL = 3) syndie = TRUE independent = TRUE - ks1type = /obj/item/device/encryptionkey/ninja + ks1type = /obj/item/encryptionkey/ninja -/obj/item/device/radio/headset/bluespace +/obj/item/radio/headset/bluespace name = "bluespace headset" desc = "A bluespace mockery of a standard NanoTrasen headset. It seems to function. Takes encryption keys." icon_state = "bs_headset" item_state = "com_headset" // laziness or genius, you decide syndie = TRUE independent = TRUE - ks1type = /obj/item/device/encryptionkey/bluespace + ks1type = /obj/item/encryptionkey/bluespace //Ghostrole headset -/obj/item/device/radio/headset/ship +/obj/item/radio/headset/ship icon_state = "syn_headset" - ks1type = /obj/item/device/encryptionkey/ship + ks1type = /obj/item/encryptionkey/ship var/use_common = FALSE -/obj/item/device/radio/headset/ship/Initialize() +/obj/item/radio/headset/ship/Initialize() if(!SSatlas.current_map.use_overmap) return ..() @@ -953,96 +953,96 @@ if (use_common) set_frequency(PUB_FREQ) -/obj/item/device/radio/headset/ship/proc/get_sector_z() +/obj/item/radio/headset/ship/proc/get_sector_z() . = GET_Z(get_turf(src)) -/obj/item/device/radio/headset/ship/odyssey - ks1type = /obj/item/device/encryptionkey/ship/odyssey +/obj/item/radio/headset/ship/odyssey + ks1type = /obj/item/encryptionkey/ship/odyssey -/obj/item/device/radio/headset/ship/odyssey/get_sector_z() +/obj/item/radio/headset/ship/odyssey/get_sector_z() if(SSodyssey.scenario_zlevels && SSodyssey.scenario_zlevels.len) . = SSodyssey.scenario_zlevels[1] else // safe fallback . = GET_Z(get_turf(src)) -/obj/item/device/radio/headset/ship/coalition_navy +/obj/item/radio/headset/ship/coalition_navy icon_state = "coal_headset" - ks1type = /obj/item/device/encryptionkey/ship/coal_navy + ks1type = /obj/item/encryptionkey/ship/coal_navy -/obj/item/device/radio/headset/ship/common +/obj/item/radio/headset/ship/common use_common = TRUE - ks1type = /obj/item/device/encryptionkey/ship/common + ks1type = /obj/item/encryptionkey/ship/common -/obj/item/device/radio/headset/binary +/obj/item/radio/headset/binary origin_tech = list(TECH_ILLEGAL = 3) - ks2type = /obj/item/device/encryptionkey/binary + ks2type = /obj/item/encryptionkey/binary -/obj/item/device/radio/headset/ert +/obj/item/radio/headset/ert name = "emergency response team radio headset" desc = "The headset of the boss's boss." icon_state = "com_headset" - ks2type = /obj/item/device/encryptionkey/ert + ks2type = /obj/item/encryptionkey/ert -/obj/item/device/radio/headset/ert/alt +/obj/item/radio/headset/ert/alt name = "emergency response team bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/ert/siib +/obj/item/radio/headset/ert/siib name = "radio headset" desc = "An updated, modular intercom that fits over the head. Takes encryption keys. This one looks slightly modified..." icon_state = "headset" item_state = "headset" -/obj/item/device/radio/headset/legion +/obj/item/radio/headset/legion name = "Tau Ceti Foreign Legion radio headset" desc = "The headset used by NanoTrasen sanctioned response forces." icon_state = "com_headset" - ks2type = /obj/item/device/encryptionkey/onlyert + ks2type = /obj/item/encryptionkey/onlyert -/obj/item/device/radio/headset/distress +/obj/item/radio/headset/distress name = "specialist radio headset" desc = "A headset used by specialists." - ks2type = /obj/item/device/encryptionkey/onlyert + ks2type = /obj/item/encryptionkey/onlyert -/obj/item/device/radio/headset/representative +/obj/item/radio/headset/representative name = "representative headset" desc = "The headset of your worst enemy." icon_state = "com_headset" - ks2type = /obj/item/device/encryptionkey/headset_com + ks2type = /obj/item/encryptionkey/headset_com -/obj/item/device/radio/headset/representative/alt +/obj/item/radio/headset/representative/alt name = "representative bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" -/obj/item/device/radio/headset/alt/double/command/representative +/obj/item/radio/headset/alt/double/command/representative name = "soundproof representative headset" -/obj/item/device/radio/headset/wrist/command/representative +/obj/item/radio/headset/wrist/command/representative name = "wristbound representative radio" -/obj/item/device/radio/headset/wrist/clip/command/representative +/obj/item/radio/headset/wrist/clip/command/representative name = "clip-on representative radio" icon_state = "clip_com" item_state = "clip_com" - ks2type = /obj/item/device/encryptionkey/headset_com + ks2type = /obj/item/encryptionkey/headset_com -/obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. +/obj/item/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. name = "\improper AI subspace transceiver" desc = "Integrated AI radio transceiver." icon = 'icons/obj/robot_component.dmi' icon_state = "radio" - ks2type = /obj/item/device/encryptionkey/heads/ai_integrated + ks2type = /obj/item/encryptionkey/heads/ai_integrated var/myAi = null // Atlantis: Reference back to the AI which has this radio. var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu. -/obj/item/device/radio/headset/heads/ai_integrated/Destroy() +/obj/item/radio/headset/heads/ai_integrated/Destroy() myAi = null . = ..() GC_TEMPORARY_HARDDEL -/obj/item/device/radio/headset/heads/ai_integrated/can_receive(input_frequency, level) +/obj/item/radio/headset/heads/ai_integrated/can_receive(input_frequency, level) return ..(input_frequency, level, !disabledAi) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index a72283e1d28..5a3c49632ed 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -15,7 +15,7 @@ dir = EAST; \ pixel_x = 8; -/obj/item/device/radio/intercom +/obj/item/radio/intercom name = "intercom (general)" desc = "An intercom with buttons for transmitting, receiving, and for volume control." desc_extended = "Has a touch display for inputting a frequency, with proper authentication. Used to communicate when you have lost your radio. \ @@ -34,35 +34,35 @@ pixel_x = 8; var/radio_sound = null clickvol = 40 -/obj/item/device/radio/intercom/north +/obj/item/radio/intercom/north PRESET_NORTH -/obj/item/device/radio/intercom/south +/obj/item/radio/intercom/south PRESET_SOUTH -/obj/item/device/radio/intercom/west +/obj/item/radio/intercom/west PRESET_WEST -/obj/item/device/radio/intercom/east +/obj/item/radio/intercom/east PRESET_EAST -/obj/item/device/radio/intercom/ship +/obj/item/radio/intercom/ship channels = list() var/default_hailing = FALSE -/obj/item/device/radio/intercom/ship/north +/obj/item/radio/intercom/ship/north PRESET_NORTH -/obj/item/device/radio/intercom/ship/south +/obj/item/radio/intercom/ship/south PRESET_SOUTH -/obj/item/device/radio/intercom/ship/west +/obj/item/radio/intercom/ship/west PRESET_WEST -/obj/item/device/radio/intercom/ship/east +/obj/item/radio/intercom/ship/east PRESET_EAST -/obj/item/device/radio/intercom/ship/Initialize() +/obj/item/radio/intercom/ship/Initialize() if(!SSatlas.current_map.use_overmap) return ..() @@ -82,229 +82,229 @@ pixel_x = 8; if (default_hailing) set_frequency(HAIL_FREQ) -/obj/item/device/radio/intercom/ship/hailing +/obj/item/radio/intercom/ship/hailing default_hailing = TRUE -/obj/item/device/radio/intercom/ship/north +/obj/item/radio/intercom/ship/north PRESET_NORTH -/obj/item/device/radio/intercom/ship/south +/obj/item/radio/intercom/ship/south PRESET_SOUTH -/obj/item/device/radio/intercom/ship/west +/obj/item/radio/intercom/ship/west PRESET_WEST -/obj/item/device/radio/intercom/ship/east +/obj/item/radio/intercom/ship/east PRESET_EAST -/obj/item/device/radio/intercom/custom +/obj/item/radio/intercom/custom name = "intercom (custom)" -/obj/item/device/radio/intercom/custom/north +/obj/item/radio/intercom/custom/north PRESET_NORTH -/obj/item/device/radio/intercom/custom/south +/obj/item/radio/intercom/custom/south PRESET_SOUTH -/obj/item/device/radio/intercom/custom/west +/obj/item/radio/intercom/custom/west PRESET_WEST -/obj/item/device/radio/intercom/custom/east +/obj/item/radio/intercom/custom/east PRESET_EAST -/obj/item/device/radio/intercom/custom/Initialize() +/obj/item/radio/intercom/custom/Initialize() . = ..() set_broadcasting(FALSE) set_listening(FALSE) -/obj/item/device/radio/intercom/hailing +/obj/item/radio/intercom/hailing name = "intercom (hailing)" -/obj/item/device/radio/intercom/hailing/north +/obj/item/radio/intercom/hailing/north PRESET_NORTH -/obj/item/device/radio/intercom/hailing/south +/obj/item/radio/intercom/hailing/south PRESET_SOUTH -/obj/item/device/radio/intercom/hailing/west +/obj/item/radio/intercom/hailing/west PRESET_WEST -/obj/item/device/radio/intercom/hailing/east +/obj/item/radio/intercom/hailing/east PRESET_EAST -/obj/item/device/radio/intercom/hailing/Initialize() +/obj/item/radio/intercom/hailing/Initialize() . = ..() set_frequency(HAIL_FREQ) -/obj/item/device/radio/intercom/interrogation +/obj/item/radio/intercom/interrogation name = "intercom (interrogation)" -/obj/item/device/radio/intercom/interrogation/north +/obj/item/radio/intercom/interrogation/north PRESET_NORTH -/obj/item/device/radio/intercom/interrogation/south +/obj/item/radio/intercom/interrogation/south PRESET_SOUTH -/obj/item/device/radio/intercom/interrogation/west +/obj/item/radio/intercom/interrogation/west PRESET_WEST -/obj/item/device/radio/intercom/interrogation/east +/obj/item/radio/intercom/interrogation/east PRESET_EAST -/obj/item/device/radio/intercom/interrogation/Initialize() +/obj/item/radio/intercom/interrogation/Initialize() . = ..() set_frequency(INT_FREQ) internal_channels = default_interrogation_channels -/obj/item/device/radio/intercom/interrogation/broadcasting/north +/obj/item/radio/intercom/interrogation/broadcasting/north PRESET_NORTH -/obj/item/device/radio/intercom/interrogation/broadcasting/south +/obj/item/radio/intercom/interrogation/broadcasting/south PRESET_SOUTH -/obj/item/device/radio/intercom/interrogation/broadcasting/west +/obj/item/radio/intercom/interrogation/broadcasting/west PRESET_WEST -/obj/item/device/radio/intercom/interrogation/broadcasting/east +/obj/item/radio/intercom/interrogation/broadcasting/east PRESET_EAST -/obj/item/device/radio/intercom/interrogation/broadcasting/Initialize() // The detainee's side. +/obj/item/radio/intercom/interrogation/broadcasting/Initialize() // The detainee's side. . = ..() set_broadcasting(TRUE) set_listening(FALSE) -/obj/item/device/radio/intercom/expedition +/obj/item/radio/intercom/expedition name = "intercom (expeditionary)" -/obj/item/device/radio/intercom/expedition/north +/obj/item/radio/intercom/expedition/north PRESET_NORTH -/obj/item/device/radio/intercom/expedition/south +/obj/item/radio/intercom/expedition/south PRESET_SOUTH -/obj/item/device/radio/intercom/expedition/west +/obj/item/radio/intercom/expedition/west PRESET_WEST -/obj/item/device/radio/intercom/expedition/east +/obj/item/radio/intercom/expedition/east PRESET_EAST -/obj/item/device/radio/intercom/expedition/Initialize() +/obj/item/radio/intercom/expedition/Initialize() . = ..() set_frequency(EXP_FREQ) internal_channels = default_expedition_channels -/obj/item/device/radio/intercom/expedition/hailing/north +/obj/item/radio/intercom/expedition/hailing/north PRESET_NORTH -/obj/item/device/radio/intercom/expedition/hailing/south +/obj/item/radio/intercom/expedition/hailing/south PRESET_SOUTH -/obj/item/device/radio/intercom/expedition/hailing/west +/obj/item/radio/intercom/expedition/hailing/west PRESET_WEST -/obj/item/device/radio/intercom/expedition/hailing/east +/obj/item/radio/intercom/expedition/hailing/east PRESET_EAST -/obj/item/device/radio/intercom/expedition/hailing/Initialize() +/obj/item/radio/intercom/expedition/hailing/Initialize() . = ..() set_frequency(HAIL_FREQ) internal_channels = default_expedition_channels -/obj/item/device/radio/intercom/private +/obj/item/radio/intercom/private name = "intercom (private)" -/obj/item/device/radio/intercom/private/north +/obj/item/radio/intercom/private/north PRESET_NORTH -/obj/item/device/radio/intercom/private/south +/obj/item/radio/intercom/private/south PRESET_SOUTH -/obj/item/device/radio/intercom/private/west +/obj/item/radio/intercom/private/west PRESET_WEST -/obj/item/device/radio/intercom/private/east +/obj/item/radio/intercom/private/east PRESET_EAST -/obj/item/device/radio/intercom/private/Initialize() +/obj/item/radio/intercom/private/Initialize() . = ..() set_frequency(AI_FREQ) -/obj/item/device/radio/intercom/specops +/obj/item/radio/intercom/specops name = "intercom (spec ops)" -/obj/item/device/radio/intercom/specops/north +/obj/item/radio/intercom/specops/north PRESET_NORTH -/obj/item/device/radio/intercom/specops/south +/obj/item/radio/intercom/specops/south PRESET_SOUTH -/obj/item/device/radio/intercom/specops/west +/obj/item/radio/intercom/specops/west PRESET_WEST -/obj/item/device/radio/intercom/specops/east +/obj/item/radio/intercom/specops/east PRESET_EAST -/obj/item/device/radio/intercom/specops/Initialize() +/obj/item/radio/intercom/specops/Initialize() . = ..() set_frequency(ERT_FREQ) -/obj/item/device/radio/intercom/department +/obj/item/radio/intercom/department canhear_range = 5 -/obj/item/device/radio/intercom/department/north +/obj/item/radio/intercom/department/north PRESET_NORTH -/obj/item/device/radio/intercom/department/south +/obj/item/radio/intercom/department/south PRESET_SOUTH -/obj/item/device/radio/intercom/department/west +/obj/item/radio/intercom/department/west PRESET_WEST -/obj/item/device/radio/intercom/department/east +/obj/item/radio/intercom/department/east PRESET_EAST -/obj/item/device/radio/intercom/department/Initialize() +/obj/item/radio/intercom/department/Initialize() . = ..() set_broadcasting(FALSE) set_listening(TRUE) -/obj/item/device/radio/intercom/department/medbay +/obj/item/radio/intercom/department/medbay name = "intercom (medical)" -/obj/item/device/radio/intercom/department/medbay/north +/obj/item/radio/intercom/department/medbay/north PRESET_NORTH -/obj/item/device/radio/intercom/department/medbay/south +/obj/item/radio/intercom/department/medbay/south PRESET_SOUTH -/obj/item/device/radio/intercom/department/medbay/west +/obj/item/radio/intercom/department/medbay/west PRESET_WEST -/obj/item/device/radio/intercom/department/medbay/east +/obj/item/radio/intercom/department/medbay/east PRESET_EAST -/obj/item/device/radio/intercom/department/medbay/Initialize() +/obj/item/radio/intercom/department/medbay/Initialize() . = ..() set_frequency(MED_I_FREQ) internal_channels = default_medbay_channels.Copy() -/obj/item/device/radio/intercom/department/security +/obj/item/radio/intercom/department/security name = "intercom (security)" -/obj/item/device/radio/intercom/department/security/north +/obj/item/radio/intercom/department/security/north PRESET_NORTH -/obj/item/device/radio/intercom/department/security/south +/obj/item/radio/intercom/department/security/south PRESET_SOUTH -/obj/item/device/radio/intercom/department/security/west +/obj/item/radio/intercom/department/security/west PRESET_WEST -/obj/item/device/radio/intercom/department/security/east +/obj/item/radio/intercom/department/security/east PRESET_EAST -/obj/item/device/radio/intercom/department/security/Initialize() +/obj/item/radio/intercom/department/security/Initialize() . = ..() set_frequency(SEC_I_FREQ) internal_channels = list( @@ -312,23 +312,23 @@ pixel_x = 8; num2text(SEC_I_FREQ) = list(ACCESS_SECURITY) ) -/obj/item/device/radio/intercom/entertainment +/obj/item/radio/intercom/entertainment name = "intercom (entertainment)" canhear_range = 4 -/obj/item/device/radio/intercom/entertainment/north +/obj/item/radio/intercom/entertainment/north PRESET_NORTH -/obj/item/device/radio/intercom/entertainment/south +/obj/item/radio/intercom/entertainment/south PRESET_SOUTH -/obj/item/device/radio/intercom/entertainment/west +/obj/item/radio/intercom/entertainment/west PRESET_WEST -/obj/item/device/radio/intercom/entertainment/east +/obj/item/radio/intercom/entertainment/east PRESET_EAST -/obj/item/device/radio/intercom/entertainment/Initialize() +/obj/item/radio/intercom/entertainment/Initialize() . = ..() set_frequency(ENT_FREQ) internal_channels = list( @@ -336,67 +336,67 @@ pixel_x = 8; num2text(ENT_FREQ) = list() ) -/obj/item/device/radio/intercom/Initialize() +/obj/item/radio/intercom/Initialize() . = ..() power_interface = new(loc, src) update_icon() -/obj/item/device/radio/intercom/syndicate +/obj/item/radio/intercom/syndicate name = "illegally modified intercom" desc = "Talk through this. Evilly." subspace_transmission = TRUE syndie = TRUE -/obj/item/device/radio/intercom/syndicate/north +/obj/item/radio/intercom/syndicate/north PRESET_NORTH -/obj/item/device/radio/intercom/syndicate/south +/obj/item/radio/intercom/syndicate/south PRESET_SOUTH -/obj/item/device/radio/intercom/syndicate/west +/obj/item/radio/intercom/syndicate/west PRESET_WEST -/obj/item/device/radio/intercom/syndicate/east +/obj/item/radio/intercom/syndicate/east PRESET_EAST -/obj/item/device/radio/intercom/syndicate/Initialize() +/obj/item/radio/intercom/syndicate/Initialize() . = ..() set_frequency(SYND_FREQ) internal_channels[num2text(SYND_FREQ)] = list(ACCESS_SYNDICATE) -/obj/item/device/radio/intercom/raider +/obj/item/radio/intercom/raider name = "illegally modified intercom" desc = "Pirate radio, but not in the usual sense of the word." subspace_transmission = TRUE syndie = TRUE -/obj/item/device/radio/intercom/raider/north +/obj/item/radio/intercom/raider/north PRESET_NORTH -/obj/item/device/radio/intercom/raider/south +/obj/item/radio/intercom/raider/south PRESET_SOUTH -/obj/item/device/radio/intercom/raider/west +/obj/item/radio/intercom/raider/west PRESET_WEST -/obj/item/device/radio/intercom/raider/east +/obj/item/radio/intercom/raider/east PRESET_EAST -/obj/item/device/radio/intercom/Destroy() +/obj/item/radio/intercom/Destroy() QDEL_NULL(power_interface) return ..() -/obj/item/device/radio/intercom/attack_ai(mob/user as mob) +/obj/item/radio/intercom/attack_ai(mob/user as mob) if(!ai_can_interact(user)) return src.add_fingerprint(user) INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/item, attack_self), user) -/obj/item/device/radio/intercom/attack_hand(mob/user as mob) +/obj/item/radio/intercom/attack_hand(mob/user as mob) src.add_fingerprint(user) INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/item, attack_self), user) -/obj/item/device/radio/intercom/can_receive(input_frequency, list/levels) +/obj/item/radio/intercom/can_receive(input_frequency, list/levels) if(!listening) return FALSE @@ -410,15 +410,15 @@ pixel_x = 8; return TRUE -/obj/item/device/radio/intercom/proc/power_change(has_power) +/obj/item/radio/intercom/proc/power_change(has_power) set_on(has_power) // has_power is given by our listener machinery update_icon() -/obj/item/device/radio/intercom/forceMove(atom/destination) +/obj/item/radio/intercom/forceMove(atom/destination) power_interface.forceMove(destination) . = ..() -/obj/item/device/radio/intercom/update_icon() +/obj/item/radio/intercom/update_icon() ClearOverlays() var/mutable_appearance/screen = overlay_image(icon, "intercom_screen") var/mutable_appearance/screen_hologram = overlay_image(icon, "intercom_screen") @@ -484,7 +484,7 @@ pixel_x = 8; screen_listening.blend_mode = BLEND_ADD AddOverlays(list(screen_listening_hologram, screen_listening)) -/obj/item/device/radio/intercom/broadcasting/Initialize() +/obj/item/radio/intercom/broadcasting/Initialize() SHOULD_CALL_PARENT(FALSE) if(flags_1 & INITIALIZED_1) @@ -495,41 +495,41 @@ pixel_x = 8; return INITIALIZE_HINT_NORMAL -/obj/item/device/radio/intercom/locked +/obj/item/radio/intercom/locked var/locked_frequency -/obj/item/device/radio/intercom/locked/north +/obj/item/radio/intercom/locked/north PRESET_NORTH -/obj/item/device/radio/intercom/locked/south +/obj/item/radio/intercom/locked/south PRESET_SOUTH -/obj/item/device/radio/intercom/locked/west +/obj/item/radio/intercom/locked/west PRESET_WEST -/obj/item/device/radio/intercom/locked/east +/obj/item/radio/intercom/locked/east PRESET_EAST -/obj/item/device/radio/intercom/locked/set_frequency(var/frequency) +/obj/item/radio/intercom/locked/set_frequency(var/frequency) if(frequency == locked_frequency) ..(locked_frequency) -/obj/item/device/radio/intercom/locked/list_channels() +/obj/item/radio/intercom/locked/list_channels() return "" -/obj/item/device/radio/intercom/locked/ai_private +/obj/item/radio/intercom/locked/ai_private name = "intercom (AI private)" -/obj/item/device/radio/intercom/locked/ai_private/Initialize() +/obj/item/radio/intercom/locked/ai_private/Initialize() . = ..() set_frequency(AI_FREQ) set_broadcasting(TRUE) set_listening(TRUE) -/obj/item/device/radio/intercom/locked/confessional +/obj/item/radio/intercom/locked/confessional name = "intercom (confessional)" -/obj/item/device/radio/intercom/locked/confessional/Initialize() +/obj/item/radio/intercom/locked/confessional/Initialize() . = ..() set_frequency(1480) diff --git a/code/game/objects/items/devices/radio/microphone.dm b/code/game/objects/items/devices/radio/microphone.dm index 30f5935796b..0e611778b6e 100644 --- a/code/game/objects/items/devices/radio/microphone.dm +++ b/code/game/objects/items/devices/radio/microphone.dm @@ -1,10 +1,10 @@ -/obj/item/device/radio/microphone +/obj/item/radio/microphone name = "handheld microphone" desc = "A handheld microphone, used for on-the-fly interviewing. Pose for the fans!" icon_state = "microphone" item_state = "microphone" -/obj/item/device/radio/microphone/Initialize() +/obj/item/radio/microphone/Initialize() . = ..() set_frequency(ENT_FREQ) internal_channels = list(num2text(ENT_FREQ) = list()) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c6ffdd6cc41..ef85c800bc6 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -38,7 +38,7 @@ var/global/list/default_interrogation_channels = list( // Radios // -/obj/item/device/radio +/obj/item/radio name = "shortwave radio" icon = 'icons/obj/radio.dmi' icon_state = "walkietalkie" @@ -107,7 +107,7 @@ var/global/list/default_interrogation_channels = list( var/datum/radio_frequency/radio_connection var/list/datum/radio_frequency/secure_radio_connections = list() -/obj/item/device/radio/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/radio/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(show_modify_on_examine && (distance <= 1)) if (b_stat) @@ -118,21 +118,21 @@ var/global/list/default_interrogation_channels = list( if(radio_desc) . += radio_desc -/obj/item/device/radio/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/radio/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "The radio key .i will allow you to speak into a nearby intercom, .r will speak into a radio in your right hand, and .l will speak into your left. The microphone does not need to be enabled for this to work." -/obj/item/device/radio/proc/set_frequency(new_frequency) +/obj/item/radio/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) if(new_frequency) frequency = new_frequency radio_connection = SSradio.add_object(src, new_frequency, RADIO_CHAT) /// By default copies default_internal_channels. Override on child for radios that need snowflake. -/obj/item/device/radio/proc/set_internal_channels() +/obj/item/radio/proc/set_internal_channels() return default_internal_channels.Copy() -/obj/item/device/radio/Initialize() +/obj/item/radio/Initialize() . = ..() wires = new(src) @@ -149,22 +149,22 @@ var/global/list/default_interrogation_channels = list( set_frequency(default_frequency) set_on(on) -/obj/item/device/radio/Destroy() +/obj/item/radio/Destroy() SSradio.remove_object_all(src) QDEL_NULL(announcer) QDEL_NULL(wires) return ..() -/obj/item/device/radio/proc/is_on() +/obj/item/radio/proc/is_on() return on -/obj/item/device/radio/proc/get_frequency() +/obj/item/radio/proc/get_frequency() return frequency -/obj/item/device/radio/proc/get_broadcasting() +/obj/item/radio/proc/get_broadcasting() return broadcasting -/obj/item/device/radio/proc/get_listening() +/obj/item/radio/proc/get_listening() return listening /** @@ -173,7 +173,7 @@ var/global/list/default_interrogation_channels = list( * * new_listening - the new value we want to set listening to * * actual_setting - whether or not the radio is supposed to be listening, sets should_be_listening to the new listening value if true, otherwise just changes listening */ -/obj/item/device/radio/proc/set_listening(new_listening, actual_setting = TRUE) +/obj/item/radio/proc/set_listening(new_listening, actual_setting = TRUE) listening = new_listening if(actual_setting) @@ -195,7 +195,7 @@ var/global/list/default_interrogation_channels = list( * * new_broadcasting- the new value we want to set broadcasting to * * actual_setting - whether or not the radio is supposed to be broadcasting, sets should_be_broadcasting to the new value if true, otherwise just changes broadcasting */ -/obj/item/device/radio/proc/set_broadcasting(new_broadcasting, actual_setting = TRUE) +/obj/item/radio/proc/set_broadcasting(new_broadcasting, actual_setting = TRUE) broadcasting = new_broadcasting if(actual_setting) @@ -207,7 +207,7 @@ var/global/list/default_interrogation_channels = list( lose_hearing_sensitivity(INNATE_TRAIT) ///setter for the on var that sets both broadcasting and listening to off or whatever they were supposed to be -/obj/item/device/radio/proc/set_on(new_on) +/obj/item/radio/proc/set_on(new_on) on = new_on @@ -218,11 +218,11 @@ var/global/list/default_interrogation_channels = list( set_broadcasting(FALSE, actual_setting = FALSE)//fake set them to off set_listening(FALSE, actual_setting = FALSE) -/obj/item/device/radio/attack_self(mob/user as mob) +/obj/item/radio/attack_self(mob/user as mob) user.set_machine(src) interact(user) -/obj/item/device/radio/interact(mob/user) +/obj/item/radio/interact(mob/user) if(!user) return 0 @@ -231,7 +231,7 @@ var/global/list/default_interrogation_channels = list( return ui_interact(user) -/obj/item/device/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/item/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data["mic_status"] = broadcasting @@ -257,7 +257,7 @@ var/global/list/default_interrogation_channels = list( ui.set_initial_data(data) ui.open() -/obj/item/device/radio/proc/setupRadioDescription(var/additional_radio_desc) +/obj/item/radio/proc/setupRadioDescription(var/additional_radio_desc) var/radio_text = "" var/found_first_department = FALSE for(var/i = 1 to channels.len) @@ -276,10 +276,10 @@ var/global/list/default_interrogation_channels = list( if(additional_radio_desc) radio_desc += additional_radio_desc -/obj/item/device/radio/proc/list_channels(var/mob/user) +/obj/item/radio/proc/list_channels(var/mob/user) return list_internal_channels(user) -/obj/item/device/radio/proc/list_secure_channels(var/mob/user) +/obj/item/radio/proc/list_secure_channels(var/mob/user) var/dat[0] for(var/ch_name in channels) @@ -290,7 +290,7 @@ var/global/list/default_interrogation_channels = list( return dat -/obj/item/device/radio/proc/list_internal_channels(var/mob/user) +/obj/item/radio/proc/list_internal_channels(var/mob/user) var/dat[0] for(var/internal_chan in internal_channels) if(has_channel_access(user, internal_chan)) @@ -298,7 +298,7 @@ var/global/list/default_interrogation_channels = list( return dat -/obj/item/device/radio/proc/has_channel_access(var/mob/user, var/freq) +/obj/item/radio/proc/has_channel_access(var/mob/user, var/freq) if(!user) return 0 @@ -314,30 +314,30 @@ var/global/list/default_interrogation_channels = list( /mob/abstract/ghost/observer/has_internal_radio_channel_access(var/list/req_one_accesses) return can_admin_interact() -/obj/item/device/radio/proc/text_wires() +/obj/item/radio/proc/text_wires() if (b_stat) return wires.get_status() return -/obj/item/device/radio/proc/text_sec_channel(var/chan_name, var/chan_stat) +/obj/item/radio/proc/text_sec_channel(var/chan_name, var/chan_stat) var/list = !!(chan_stat&FREQ_LISTENING)!=0 return {" [chan_name]
Speaker: [list ? "Engaged" : "Disengaged"]
"} -/obj/item/device/radio/CanUseTopic() +/obj/item/radio/CanUseTopic() if(!on) return STATUS_CLOSE return ..() -/obj/item/device/radio/CouldUseTopic(var/mob/user) +/obj/item/radio/CouldUseTopic(var/mob/user) ..() if(clicksound && iscarbon(user)) playsound(loc, clicksound, clickvol) -/obj/item/device/radio/Topic(href, href_list) +/obj/item/radio/Topic(href, href_list) if(..()) return TRUE @@ -388,7 +388,7 @@ var/global/list/default_interrogation_channels = list( SSnanoui.update_uis(src) update_icon() -/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT +/obj/item/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if(channel == "department") @@ -417,7 +417,7 @@ var/global/list/default_interrogation_channels = list( announcer.ResetAfterBroadcast() // Interprets the message mode when talking into a radio, possibly returning a connection datum -/obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode) +/obj/item/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode) // If a channel isn't specified, send to common. if(!message_mode || message_mode == "headset") return radio_connection @@ -438,7 +438,7 @@ var/global/list/default_interrogation_channels = list( // If we were to send to a channel we don't have, drop it. return null -/obj/item/device/radio/talk_into(mob/living/M, message, channel, var/say_verb = "says", var/datum/language/speaking = null, var/ignore_restrained) +/obj/item/radio/talk_into(mob/living/M, message, channel, var/say_verb = "says", var/datum/language/speaking = null, var/ignore_restrained) if(!on) return FALSE if(!M || !message) @@ -495,7 +495,7 @@ var/global/list/default_interrogation_channels = list( // Non-subspace radios will check in a couple of seconds, and if the signal was never received, we send a mundane broadcast addtimer(CALLBACK(src, PROC_REF(backup_transmission), signal), 2 SECONDS) -/obj/item/device/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal) +/obj/item/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal) var/turf/T = get_turf(src) if (signal.data["done"] && (T.z in signal.levels)) return @@ -506,13 +506,13 @@ var/global/list/default_interrogation_channels = list( signal.levels = GetConnectedZlevels(T.z) signal.broadcast() -/obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null) +/obj/item/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null) if (!broadcasting || get_dist(src, M) > canhear_range) return return talk_into(M, msg, null, verb, speaking, ignore_restrained = TRUE) -/obj/item/device/radio/proc/can_receive(input_frequency, list/levels) +/obj/item/radio/proc/can_receive(input_frequency, list/levels) // check if the radio can receive on the given frequency if (!listening) return @@ -538,19 +538,19 @@ var/global/list/default_interrogation_channels = list( return FALSE -/obj/item/device/radio/proc/send_hear(freq, level) +/obj/item/radio/proc/send_hear(freq, level) if(!can_receive(freq, level)) return return get_hearers_in_view(canhear_range, src) -/obj/item/device/radio/attackby(obj/item/attacking_item, mob/user) +/obj/item/radio/attackby(obj/item/attacking_item, mob/user) ..() user.set_machine(src) if (!( attacking_item.tool_behaviour == TOOL_SCREWDRIVER )) return b_stat = !( b_stat ) - if(!istype(src, /obj/item/device/radio/beacon)) + if(!istype(src, /obj/item/radio/beacon)) if (b_stat) user.show_message(SPAN_NOTICE("\The [src] can now be attached and modified!")) else @@ -561,7 +561,7 @@ var/global/list/default_interrogation_channels = list( return else return -/obj/item/device/radio/emp_act(severity) +/obj/item/radio/emp_act(severity) . = ..() set_broadcasting(FALSE) @@ -573,9 +573,9 @@ var/global/list/default_interrogation_channels = list( // Vesselbound Synthetic Radio // -/obj/item/device/radio/borg +/obj/item/radio/borg var/mob/living/silicon/robot/myborg = null // Cyborg which owns this radio. Used for power checks - var/obj/item/device/encryptionkey/keyslot = null//Borg radios can handle a single encryption key + var/obj/item/encryptionkey/keyslot = null//Borg radios can handle a single encryption key var/shut_up = 1 icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component. icon_state = "radio" @@ -584,25 +584,25 @@ var/global/list/default_interrogation_channels = list( name = "integrated radio" var/radio_sound = null -/obj/item/device/radio/borg/Destroy() +/obj/item/radio/borg/Destroy() myborg = null . = ..() GC_TEMPORARY_HARDDEL -/obj/item/device/radio/borg/list_channels(var/mob/user) +/obj/item/radio/borg/list_channels(var/mob/user) return list_secure_channels(user) -/obj/item/device/radio/borg/talk_into(mob/living/M, message, channel, verb, datum/language/speaking, var/ignore_restrained) +/obj/item/radio/borg/talk_into(mob/living/M, message, channel, verb, datum/language/speaking, var/ignore_restrained) . = ..() if (isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc var/datum/robot_component/C = R.components["radio"] R.cell_use_power(C.active_usage) -/obj/item/device/radio/borg/attackby(obj/item/attacking_item, mob/user) +/obj/item/radio/borg/attackby(obj/item/attacking_item, mob/user) // ..() user.set_machine(src) - if (!( attacking_item.tool_behaviour == TOOL_SCREWDRIVER || (istype(attacking_item, /obj/item/device/encryptionkey/ )))) + if (!( attacking_item.tool_behaviour == TOOL_SCREWDRIVER || (istype(attacking_item, /obj/item/encryptionkey/ )))) return if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) @@ -626,7 +626,7 @@ var/global/list/default_interrogation_channels = list( else to_chat(user, "This radio doesn't have any encryption keys!") - if(istype(attacking_item, /obj/item/device/encryptionkey/)) + if(istype(attacking_item, /obj/item/encryptionkey/)) if(keyslot) to_chat(user, "The radio can't hold another key!") return @@ -639,7 +639,7 @@ var/global/list/default_interrogation_channels = list( return -/obj/item/device/radio/borg/proc/recalculateChannels() +/obj/item/radio/borg/proc/recalculateChannels() channels = list(CHANNEL_COMMON = TRUE, CHANNEL_ENTERTAINMENT = TRUE, CHANNEL_EXPED = TRUE) syndie = FALSE @@ -674,7 +674,7 @@ var/global/list/default_interrogation_channels = list( setupRadioDescription() return -/obj/item/device/radio/borg/Topic(href, href_list) +/obj/item/radio/borg/Topic(href, href_list) if(..()) return 1 if (href_list["mode"]) @@ -706,13 +706,13 @@ var/global/list/default_interrogation_channels = list( if(.) SSnanoui.update_uis(src) -/obj/item/device/radio/borg/interact(mob/user as mob) +/obj/item/radio/borg/interact(mob/user as mob) if(!on) return . = ..() -/obj/item/device/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/item/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] data["mic_status"] = broadcasting @@ -740,7 +740,7 @@ var/global/list/default_interrogation_channels = list( ui.set_initial_data(data) ui.open() -/obj/item/device/radio/proc/config(op) +/obj/item/radio/proc/config(op) if(SSradio) for (var/ch_name in channels) SSradio.remove_object(src, radiochannels[ch_name]) @@ -755,10 +755,10 @@ var/global/list/default_interrogation_channels = list( // Radio Variants // -/obj/item/device/radio/map_preset +/obj/item/radio/map_preset channels = list() -/obj/item/device/radio/map_preset/Initialize() +/obj/item/radio/map_preset/Initialize() if(!SSatlas.current_map.use_overmap) return ..() @@ -779,86 +779,86 @@ var/global/list/default_interrogation_channels = list( return ..() -/obj/item/device/radio/map_preset/set_internal_channels() +/obj/item/radio/map_preset/set_internal_channels() return list( num2text(default_frequency) = list(), num2text(HAIL_FREQ) = list() ) -/obj/item/device/radio/hailing +/obj/item/radio/hailing default_frequency = HAIL_FREQ -/obj/item/device/radio/hailing/set_internal_channels() +/obj/item/radio/hailing/set_internal_channels() return list( num2text(HAIL_FREQ) = list() ) -/obj/item/device/radio/hailing/Initialize() +/obj/item/radio/hailing/Initialize() channels = list( CHANNEL_HAILING = TRUE ) return ..() // Radio (Off) -/obj/item/device/radio/off/Initialize() +/obj/item/radio/off/Initialize() . = ..() set_listening(FALSE) // Medical -/obj/item/device/radio/med +/obj/item/radio/med icon_state = "walkietalkie-med" // Medical (Off) -/obj/item/device/radio/med/off/Initialize() +/obj/item/radio/med/off/Initialize() . = ..() set_listening(FALSE) // Security -/obj/item/device/radio/sec +/obj/item/radio/sec icon_state = "walkietalkie-sec" // Security (Off) -/obj/item/device/radio/sec/off/Initialize() +/obj/item/radio/sec/off/Initialize() . = ..() set_listening(FALSE) // Engineering -/obj/item/device/radio/eng +/obj/item/radio/eng icon_state = "walkietalkie-eng" // Engineering (Off) -/obj/item/device/radio/eng/off/Initialize() +/obj/item/radio/eng/off/Initialize() . = ..() set_listening(FALSE) // Science -/obj/item/device/radio/sci +/obj/item/radio/sci icon_state = "walkietalkie-sci" // Science (Off) -/obj/item/device/radio/sci/off/Initialize() +/obj/item/radio/sci/off/Initialize() . = ..() set_listening(FALSE) // Phone -/obj/item/device/radio/phone +/obj/item/radio/phone icon = 'icons/obj/radio.dmi' icon_state = "red_phone" name = "phone" var/radio_sound = null -/obj/item/device/radio/phone/Initialize() +/obj/item/radio/phone/Initialize() . = ..() set_broadcasting(FALSE) set_listening(TRUE) // Medical Phone -/obj/item/device/radio/phone/medbay/Initialize() +/obj/item/radio/phone/medbay/Initialize() . = ..() set_frequency(MED_I_FREQ) internal_channels = default_medbay_channels.Copy() // All-channel Radio -/obj/item/device/radio/all_channels/Initialize() +/obj/item/radio/all_channels/Initialize() channels = ALL_RADIO_CHANNELS.Copy() . = ..() diff --git a/code/game/objects/items/devices/radio_jammer.dm b/code/game/objects/items/devices/radio_jammer.dm index e96be1831ff..37558776c2d 100644 --- a/code/game/objects/items/devices/radio_jammer.dm +++ b/code/game/objects/items/devices/radio_jammer.dm @@ -1,12 +1,12 @@ //Global list for housing active radiojammers: -GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list()) +GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/radiojammer, list()) // tests if an object is near a radio jammer // if need_all_blocked is false, the jammer only needs to be on JAMMER_SYNTHETIC to work /proc/within_jamming_range(var/atom/test, var/need_all_blocked = TRUE) if(length(GLOB.active_radio_jammers)) var/turf/our_turf = get_turf(test) - for(var/obj/item/device/radiojammer/J in GLOB.active_radio_jammers) + for(var/obj/item/radiojammer/J in GLOB.active_radio_jammers) var/turf/jammer_turf = get_turf(J) if(our_turf.z != jammer_turf.z) continue @@ -16,10 +16,10 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( return TRUE return FALSE -/obj/item/device/radiojammer +/obj/item/radiojammer name = "radio jammer" desc = "A small, inconspicious looking item with an 'ON/OFF' toggle." - icon = 'icons/obj/item/device/chameleon.dmi' + icon = 'icons/obj/item/chameleon.dmi' icon_state = "shield0" item_state = "electronic" w_class = WEIGHT_CLASS_SMALL @@ -28,37 +28,37 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( var/icon_state_active = "shield1" var/icon_state_inactive = "shield0" -/obj/item/device/radiojammer/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/radiojammer/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Use in-hand to activate or deactivate." . += "Alt-click while adjacent or in-hand to toggle whether it blocks all signals or just stationbound wireless interfacing." -/obj/item/device/radiojammer/active +/obj/item/radiojammer/active active = JAMMER_ALL -/obj/item/device/radiojammer/New() +/obj/item/radiojammer/New() ..() update_icon() -/obj/item/device/radiojammer/Destroy() +/obj/item/radiojammer/Destroy() GLOB.active_radio_jammers -= src return ..() -/obj/item/device/radiojammer/attack_self(mob/user) +/obj/item/radiojammer/attack_self(mob/user) ui_interact(user) -/obj/item/device/radiojammer/ui_interact(mob/user, datum/tgui/ui) +/obj/item/radiojammer/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Jammer", "Radio Jammer", 200, 200) ui.open() -/obj/item/device/radiojammer/ui_data(mob/user) +/obj/item/radiojammer/ui_data(mob/user) var/list/data = list() data["active"] = active return data -/obj/item/device/radiojammer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/radiojammer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return TRUE @@ -69,12 +69,12 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( update_icon() . = TRUE -/obj/item/device/radiojammer/emp_act(severity) +/obj/item/radiojammer/emp_act(severity) . = ..() toggle() -/obj/item/device/radiojammer/proc/toggle(var/mob/user) +/obj/item/radiojammer/proc/toggle(var/mob/user) if(active) if(user) to_chat(user, SPAN_NOTICE("You deactivate \the [src].")) @@ -85,7 +85,7 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( active = JAMMER_ALL update_icon() -/obj/item/device/radiojammer/update_icon() +/obj/item/radiojammer/update_icon() if(active > 0) GLOB.active_radio_jammers += src icon_state = icon_state_active @@ -94,11 +94,11 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( icon_state = icon_state_inactive -/obj/item/device/radiojammer/improvised +/obj/item/radiojammer/improvised name = "improvised radio jammer" desc = "An awkward bundle of wires, batteries, and radio transmitters." var/obj/item/cell/cell - var/obj/item/device/assembly_holder/assembly_holder + var/obj/item/assembly_holder/assembly_holder // 10 seconds of operation on a standard cell. 200 (roughly 3 minutes) on a super cap. var/power_drain_per_second = 100 var/last_updated = null @@ -107,11 +107,11 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( icon_state = "improvised_jammer_inactive" icon_state_active = "improvised_jammer_active" -/obj/item/device/radiojammer/improvised/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/radiojammer/improvised/mechanics_hints(mob/user, distance, is_adjacent) . = list() . += "Use in-hand to activate or deactivate." -/obj/item/device/radiojammer/improvised/New(var/obj/item/device/assembly_holder/incoming_holder, var/obj/item/cell/incoming_cell, var/mob/user) +/obj/item/radiojammer/improvised/New(var/obj/item/assembly_holder/incoming_holder, var/obj/item/cell/incoming_cell, var/mob/user) ..() cell = incoming_cell assembly_holder = incoming_holder @@ -124,12 +124,12 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( user.put_in_active_hand(src) -/obj/item/device/radiojammer/improvised/Destroy() +/obj/item/radiojammer/improvised/Destroy() STOP_PROCESSING(SSprocessing, src) return ..() -/obj/item/device/radiojammer/improvised/process() +/obj/item/radiojammer/improvised/process() var/current = world.time // current tick var/delta = (current - last_updated) / 10.0 // delta in seconds last_updated = current @@ -139,7 +139,7 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( update_icon() -/obj/item/device/radiojammer/improvised/attackby(obj/item/attacking_item, mob/user) +/obj/item/radiojammer/improvised/attackby(obj/item/attacking_item, mob/user) if (attacking_item.tool_behaviour == TOOL_SCREWDRIVER) to_chat(user, SPAN_NOTICE("You disassemble the improvised signal jammer.")) user.put_in_hands(assembly_holder) @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( qdel(src) return TRUE -/obj/item/device/radiojammer/improvised/toggle(mob/user) +/obj/item/radiojammer/improvised/toggle(mob/user) if(!active) if(!cell) if(user) @@ -160,7 +160,7 @@ GLOBAL_LIST_INIT_TYPED(active_radio_jammers, /obj/item/device/radiojammer, list( return return ..() -/obj/item/device/radiojammer/improvised/update_icon() +/obj/item/radiojammer/improvised/update_icon() if(active > 0) GLOB.active_radio_jammers += src icon_state = icon_state_active diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 0cda69be0a9..ffc30f8492d 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -7,10 +7,10 @@ REAGENT SCANNER BREATH ANALYZER */ -/obj/item/device/healthanalyzer +/obj/item/healthanalyzer name = "health analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." - icon = 'icons/obj/item/device/healthanalyzer.dmi' + icon = 'icons/obj/item/healthanalyzer.dmi' icon_state = "health" item_state = "analyzer" obj_flags = OBJ_FLAG_CONDUCTABLE @@ -25,7 +25,7 @@ BREATH ANALYZER var/mode = 1 var/sound_scan = FALSE -/obj/item/device/healthanalyzer/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/healthanalyzer/attack(mob/living/target_mob, mob/living/user, target_zone) sound_scan = FALSE if(last_scan <= world.time - 20) //Spam limiter. last_scan = world.time @@ -35,7 +35,7 @@ BREATH ANALYZER health_scan_mob(target_mob, user, mode, sound_scan = sound_scan) add_fingerprint(user) -/obj/item/device/healthanalyzer/attack_self(mob/user) +/obj/item/healthanalyzer/attack_self(mob/user) sound_scan = FALSE if(last_scan <= world.time - 20) //Spam limiter. last_scan = world.time @@ -360,7 +360,7 @@ BREATH ANALYZER to_chat(user, .) to_chat(user, "
") -/obj/item/device/healthanalyzer/verb/toggle_mode() +/obj/item/healthanalyzer/verb/toggle_mode() set name = "Switch Verbosity" set category = "Object.Held" set src in usr @@ -372,10 +372,10 @@ BREATH ANALYZER else to_chat(usr, "The scanner no longer shows limb damage.") -/obj/item/device/analyzer +/obj/item/analyzer name = "analyzer" desc = "A hand-held environmental scanner which reports current gas levels." - icon = 'icons/obj/item/device/air_analyzer.dmi' + icon = 'icons/obj/item/air_analyzer.dmi' icon_state = "analyzer" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL @@ -389,14 +389,14 @@ BREATH ANALYZER origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) -/obj/item/device/analyzer/atmosanalyze(var/mob/user) +/obj/item/analyzer/atmosanalyze(var/mob/user) if(!user) return var/air = user.return_air() if (!air) return return atmosanalyzer_scan(src, air, user) -/obj/item/device/analyzer/attack_self(mob/user as mob) +/obj/item/analyzer/attack_self(mob/user as mob) if (user.stat) return @@ -407,10 +407,10 @@ BREATH ANALYZER analyze_gases(src, user) return -/obj/item/device/mass_spectrometer +/obj/item/mass_spectrometer name = "mass spectrometer" desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample." - icon = 'icons/obj/item/device/mass_spectrometer.dmi' + icon = 'icons/obj/item/mass_spectrometer.dmi' icon_state = "spectrometer" item_state = "spectrometer" w_class = WEIGHT_CLASS_SMALL @@ -426,11 +426,11 @@ BREATH ANALYZER origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) var/details = FALSE -/obj/item/device/mass_spectrometer/Initialize() +/obj/item/mass_spectrometer/Initialize() . = ..() create_reagents(5) -/obj/item/device/mass_spectrometer/on_reagent_change() +/obj/item/mass_spectrometer/on_reagent_change() clear_blood_overlay() if(reagents.total_volume) icon_state = initial(icon_state) + "_s" @@ -440,13 +440,13 @@ BREATH ANALYZER else icon_state = initial(icon_state) -/obj/item/device/mass_spectrometer/proc/clear_blood_overlay() +/obj/item/mass_spectrometer/proc/clear_blood_overlay() underlays = null -/obj/item/device/mass_spectrometer/proc/add_blood_overlay(var/image/I) +/obj/item/mass_spectrometer/proc/add_blood_overlay(var/image/I) underlays += I -/obj/item/device/mass_spectrometer/attack_self(mob/user) +/obj/item/mass_spectrometer/attack_self(mob/user) if(use_check_and_message(user)) return if(reagents.total_volume) @@ -470,23 +470,23 @@ BREATH ANALYZER output_text[1] = SPAN_NOTICE("No trace chemicals found.") to_chat(user, jointext(output_text, "\n")) -/obj/item/device/mass_spectrometer/adv +/obj/item/mass_spectrometer/adv name = "advanced mass spectrometer" icon_state = "adv_spectrometer" item_state = "adv_spectrometer" details = TRUE origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) -/obj/item/device/mass_spectrometer/adv/clear_blood_overlay() +/obj/item/mass_spectrometer/adv/clear_blood_overlay() ClearOverlays() -/obj/item/device/mass_spectrometer/adv/add_blood_overlay(var/image/I) +/obj/item/mass_spectrometer/adv/add_blood_overlay(var/image/I) AddOverlays(I) -/obj/item/device/reagent_scanner +/obj/item/reagent_scanner name = "reagent scanner" desc = "A hand-held reagent scanner which identifies chemical agents." - icon = 'icons/obj/item/device/reagent_scanner.dmi' + icon = 'icons/obj/item/reagent_scanner.dmi' icon_state = "reagent_scanner" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL @@ -501,7 +501,7 @@ BREATH ANALYZER var/details = 0 var/recent_fail = 0 -/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user, proximity) +/obj/item/reagent_scanner/afterattack(obj/O, mob/user, proximity) if(!proximity) return if(use_check_and_message(user)) @@ -519,16 +519,16 @@ BREATH ANALYZER dat += "\n \t [R][details ? ": [O.reagents.reagent_volumes[_R] / one_percent]%" : ""]" to_chat(user, SPAN_NOTICE("Chemicals found: [dat]")) -/obj/item/device/reagent_scanner/adv +/obj/item/reagent_scanner/adv name = "advanced reagent scanner" icon_state = "adv_reagent_scanner" item_state = "analyzer" details = 1 origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) -/obj/item/device/slime_scanner +/obj/item/slime_scanner name = "slime scanner" - icon = 'icons/obj/item/device/slime_scanner.dmi' + icon = 'icons/obj/item/slime_scanner.dmi' icon_state = "slime_scanner" item_state = "analyzer" origin_tech = list(TECH_BIO = 1) @@ -539,7 +539,7 @@ BREATH ANALYZER throw_range = 7 matter = list(MATERIAL_ALUMINIUM = 30, MATERIAL_GLASS = 20) -/obj/item/device/slime_scanner/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/slime_scanner/attack(mob/living/target_mob, mob/living/user, target_zone) if(!isslime(target_mob)) to_chat(user, SPAN_WARNING("This device can only scan slimes!")) return @@ -571,10 +571,10 @@ BREATH ANALYZER to_chat(user, SPAN_NOTICE("Instability: [mut_chance]% chance of mutation upon reproduction.")) to_chat(user, SPAN_NOTICE("**************************")) -/obj/item/device/price_scanner +/obj/item/price_scanner name = "price scanner" desc = "Using an up-to-date database of various costs and prices, this device estimates the market price of an item up to 0.001% accuracy." - icon = 'icons/obj/item/device/price_scanner.dmi' + icon = 'icons/obj/item/price_scanner.dmi' icon_state = "price_scanner" item_flags = ITEM_FLAG_NO_BLUDGEON slot_flags = SLOT_BELT @@ -584,7 +584,7 @@ BREATH ANALYZER throw_range = 3 matter = list(DEFAULT_WALL_MATERIAL = 25, MATERIAL_GLASS = 25) -/obj/item/device/price_scanner/afterattack(atom/movable/target, mob/user as mob, proximity) +/obj/item/price_scanner/afterattack(atom/movable/target, mob/user as mob, proximity) if(!proximity) return @@ -592,10 +592,10 @@ BREATH ANALYZER user.visible_message(SPAN_NOTICE("\The [user] scans \the [target] with \the [src].")) to_chat(user, SPAN_NOTICE("\The [src] estimates the price of \the [target] at [value ? value : "N/A"].")) -/obj/item/device/breath_analyzer +/obj/item/breath_analyzer name = "breath analyzer" desc = "A hand-held breath analyzer that provides a robust amount of information about the subject's respiratory system." - icon = 'icons/obj/item/device/breath_analyzer.dmi' + icon = 'icons/obj/item/breath_analyzer.dmi' icon_state = "breath_analyzer" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL @@ -607,7 +607,7 @@ BREATH ANALYZER matter = list(MATERIAL_ALUMINIUM = 30, MATERIAL_GLASS = 20) origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) -/obj/item/device/breath_analyzer/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/breath_analyzer/attack(mob/living/target_mob, mob/living/user, target_zone) var/mob/living/carbon/human/H = target_mob @@ -702,10 +702,10 @@ BREATH ANALYZER to_chat(user,SPAN_WARNING("Non-medical reagent[(unknown > 1)?"s":""] found in subject's respiratory system.")) -/obj/item/device/advanced_healthanalyzer +/obj/item/advanced_healthanalyzer name = "advanced health analyzer" desc = "An expensive and varied-use health analyzer that prints full-body scans after a short scanning delay." - icon = 'icons/obj/item/device/advanced_healthanalyzer.dmi' + icon = 'icons/obj/item/advanced_healthanalyzer.dmi' icon_state = "health_adv" item_state = "analyzer" slot_flags = SLOT_BELT @@ -713,7 +713,7 @@ BREATH ANALYZER origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 3) var/obj/machinery/body_scanconsole/connected = null //this is used to print the date and to deal with extra -/obj/item/device/advanced_healthanalyzer/Initialize() +/obj/item/advanced_healthanalyzer/Initialize() . = ..() if(!connected) var/obj/machinery/body_scanconsole/S = new (src) @@ -721,12 +721,12 @@ BREATH ANALYZER S.update_use_power(POWER_USE_OFF) connected = S -/obj/item/device/advanced_healthanalyzer/Destroy() +/obj/item/advanced_healthanalyzer/Destroy() if(connected) QDEL_NULL(connected) return ..() -/obj/item/device/advanced_healthanalyzer/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/advanced_healthanalyzer/attack(mob/living/target_mob, mob/living/user, target_zone) if(!connected) return user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) @@ -736,18 +736,18 @@ BREATH ANALYZER print_scan(target_mob, user) add_fingerprint(user) -/obj/item/device/advanced_healthanalyzer/proc/print_scan(var/mob/M, var/mob/living/user) +/obj/item/advanced_healthanalyzer/proc/print_scan(var/mob/M, var/mob/living/user) var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(src, connected.format_occupant_data(get_occupant_data(M)), "Scan ([M.name]) ([worldtime2text()])", M) connected.print(R, message = "\The [src] beeps, printing \the [R] after a moment.", user = user) /// Variant of print_scan(), main difference is different method to print the paper -/obj/item/device/advanced_healthanalyzer/cyborg/print_scan(var/mob/M, var/mob/living/user) +/obj/item/advanced_healthanalyzer/cyborg/print_scan(var/mob/M, var/mob/living/user) var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(src, connected.format_occupant_data(get_occupant_data(M)), "Scan ([M.name]) ([worldtime2text()])", M) user.visible_message(SPAN_NOTICE("\The [src] beeps, printing \the [R] after a moment.")) playsound(user.loc, SFX_PRINT, 50, 1) R.forceMove(user.loc) -/obj/item/device/advanced_healthanalyzer/proc/get_occupant_data(var/mob/living/carbon/human/H) +/obj/item/advanced_healthanalyzer/proc/get_occupant_data(var/mob/living/carbon/human/H) if (!ishuman(H)) return diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index bf78d345011..69a912402fa 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -1,4 +1,4 @@ -/obj/item/device/spy_bug +/obj/item/spy_bug name = "bug" desc = "" // Nothing to see here icon = 'icons/obj/weapons.dmi' @@ -16,37 +16,37 @@ origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) - var/obj/item/device/radio/spy/radio + var/obj/item/radio/spy/radio var/obj/machinery/camera/spy/camera -/obj/item/device/spy_bug/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/spy_bug/mechanics_hints(mob/user, distance, is_adjacent) . += ..() if(distance <= 0) . += "Needs to be both configured and brought in contact with monitor device to be fully functional." . += "A pen can be used to label the device on a given network." -/obj/item/device/spy_bug/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/spy_bug/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(distance <= 0) . += "It's a tiny camera, microphone, and transmission device in a happy union." -/obj/item/device/spy_bug/New() +/obj/item/spy_bug/New() ..() radio = new(src) camera = new(src) become_hearing_sensitive(ROUNDSTART_TRAIT) -/obj/item/device/spy_bug/attack_self(mob/user) +/obj/item/spy_bug/attack_self(mob/user) radio.set_broadcasting(!radio.get_broadcasting()) to_chat(user, "\The [src]'s radio is [radio.get_broadcasting() ? "broadcasting" : "not broadcasting"] now. The current frequency is [radio.get_frequency()].") radio.attack_self(user) -/obj/item/device/spy_bug/attackby(obj/item/attacking_item, mob/user) +/obj/item/spy_bug/attackby(obj/item/attacking_item, mob/user) if(!istype(user)) return - if(istype(attacking_item, /obj/item/device/spy_monitor)) - var/obj/item/device/spy_monitor/SM = attacking_item + if(istype(attacking_item, /obj/item/spy_monitor)) + var/obj/item/spy_monitor/SM = attacking_item SM.pair(src, user) return TRUE if(attacking_item.tool_behaviour == TOOL_PEN) @@ -58,11 +58,11 @@ else return ..() -/obj/item/device/spy_bug/hear_talk(mob/M, var/msg, verb, datum/language/speaking) +/obj/item/spy_bug/hear_talk(mob/M, var/msg, verb, datum/language/speaking) radio.hear_talk(M, msg, verb, speaking) -/obj/item/device/spy_monitor +/obj/item/spy_monitor name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." icon = 'icons/obj/pda.dmi' @@ -74,37 +74,37 @@ origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) var/operating = 0 - var/obj/item/device/radio/spy/radio + var/obj/item/radio/spy/radio var/obj/machinery/camera/spy/selected_camera var/list/obj/machinery/camera/spy/cameras = new() -/obj/item/device/spy_monitor/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/spy_monitor/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(distance <= 1) . += "The time '12:00' is blinking in the corner of the screen and \the [src] looks very cheaply made." -/obj/item/device/spy_monitor/New() +/obj/item/spy_monitor/New() radio = new(src) become_hearing_sensitive(ROUNDSTART_TRAIT) -/obj/item/device/spy_monitor/attack_self(mob/user) +/obj/item/spy_monitor/attack_self(mob/user) if(operating) return radio.attack_self(user) view_cameras(user) -/obj/item/device/spy_monitor/attackby(obj/item/attacking_item, mob/user) +/obj/item/spy_monitor/attackby(obj/item/attacking_item, mob/user) if(!istype(user)) return - if(istype(attacking_item, /obj/item/device/spy_bug)) + if(istype(attacking_item, /obj/item/spy_bug)) pair(attacking_item, user) return TRUE else return ..() -/obj/item/device/spy_monitor/proc/pair(var/obj/item/device/spy_bug/SB, var/mob/living/user) +/obj/item/spy_monitor/proc/pair(var/obj/item/spy_bug/SB, var/mob/living/user) if(SB.camera in cameras) to_chat(user, SPAN_NOTICE("\The [SB] has been unpaired from \the [src].")) cameras -= SB.camera @@ -112,7 +112,7 @@ to_chat(user, SPAN_NOTICE("\The [SB] has been paired with \the [src].")) cameras += SB.camera -/obj/item/device/spy_monitor/proc/view_cameras(mob/user) +/obj/item/spy_monitor/proc/view_cameras(mob/user) if(!can_use_cam(user)) return @@ -125,7 +125,7 @@ selected_camera = null operating = FALSE -/obj/item/device/spy_monitor/proc/view_camera(mob/user) +/obj/item/spy_monitor/proc/view_camera(mob/user) spawn(0) while(selected_camera && Adjacent(user)) var/turf/T = get_turf(selected_camera) @@ -141,7 +141,7 @@ user.unset_machine() user.reset_view(null) -/obj/item/device/spy_monitor/proc/can_use_cam(mob/user) +/obj/item/spy_monitor/proc/can_use_cam(mob/user) if(operating) return @@ -152,7 +152,7 @@ return 1 -/obj/item/device/spy_monitor/hear_talk(mob/M, var/msg, verb, datum/language/speaking) +/obj/item/spy_monitor/hear_talk(mob/M, var/msg, verb, datum/language/speaking) return radio.hear_talk(M, msg, speaking) @@ -172,12 +172,12 @@ /obj/machinery/camera/spy/check_eye(var/mob/user as mob) return FALSE -/obj/item/device/radio/spy +/obj/item/radio/spy canhear_range = 7 name = "spy device" icon_state = "syn_cypherkey" -/obj/item/device/radio/spy/Initialize() +/obj/item/radio/spy/Initialize() . = ..() set_broadcasting(FALSE) set_listening(FALSE) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 1979c800bbf..9700c5ded9b 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -1,8 +1,8 @@ -/obj/item/device/suit_cooling_unit +/obj/item/suit_cooling_unit name = "portable suit cooling unit" desc = "A portable heat sink and liquid cooled radiator that can be hooked up to a space suit's existing temperature controls to provide industrial levels of cooling." w_class = WEIGHT_CLASS_BULKY - icon = 'icons/obj/item/device/suitcooler.dmi' + icon = 'icons/obj/item/suitcooler.dmi' icon_state = "suitcooler0" item_state = "coolingpack" action_button_name = "Toggle Cooling Unit" @@ -29,7 +29,7 @@ //TODO: make it heat up the surroundings when not in space -/obj/item/device/suit_cooling_unit/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/suit_cooling_unit/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(!distance <= 1) @@ -58,26 +58,26 @@ else . += SPAN_NOTICE("It doesn't have a power cell installed.") -/obj/item/device/suit_cooling_unit/Initialize() +/obj/item/suit_cooling_unit/Initialize() . = ..() if(celltype) cell = new celltype(src) -/obj/item/device/suit_cooling_unit/Destroy() +/obj/item/suit_cooling_unit/Destroy() STOP_PROCESSING(SSmobs, src) QDEL_NULL(cell) return ..() // Checks whether the cooling unit is being worn on the back/suit slot. // That way you can't carry it in your hands while it's running to cool yourself down. -/obj/item/device/suit_cooling_unit/proc/is_in_slot() +/obj/item/suit_cooling_unit/proc/is_in_slot() var/mob/living/carbon/human/H = loc if(!istype(H)) return FALSE return (H.back == src) || (H.s_store == src) -/obj/item/device/suit_cooling_unit/process() +/obj/item/suit_cooling_unit/process() if(!on || !cell) return @@ -104,7 +104,7 @@ update_icon() -/obj/item/device/suit_cooling_unit/proc/get_environment_temperature() +/obj/item/suit_cooling_unit/proc/get_environment_temperature() if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(istype(H.loc, /obj/machinery/atmospherics/unary/cryo_cell)) @@ -121,7 +121,7 @@ return environment.temperature -/obj/item/device/suit_cooling_unit/proc/attached_to_suit(mob/M) +/obj/item/suit_cooling_unit/proc/attached_to_suit(mob/M) if(!ishuman(M)) return FALSE @@ -132,7 +132,7 @@ return TRUE -/obj/item/device/suit_cooling_unit/proc/turn_on() +/obj/item/suit_cooling_unit/proc/turn_on() if(!cell) return if(cell.charge <= 0) @@ -142,7 +142,7 @@ START_PROCESSING(SSmobs, src) update_icon() -/obj/item/device/suit_cooling_unit/proc/turn_off() +/obj/item/suit_cooling_unit/proc/turn_off() if(ismob(src.loc)) var/mob/M = src.loc to_chat(M, SPAN_WARNING("\The [src] clicks and whines as it powers down.")) @@ -150,7 +150,7 @@ STOP_PROCESSING(SSmobs, src) update_icon() -/obj/item/device/suit_cooling_unit/attack_self(mob/user) +/obj/item/suit_cooling_unit/attack_self(mob/user) if(cover_open && cell) if(ishuman(user)) user.put_in_hands(cell) @@ -166,11 +166,11 @@ return toggle_power(user) -/obj/item/device/suit_cooling_unit/AltClick(mob/user) +/obj/item/suit_cooling_unit/AltClick(mob/user) if(Adjacent(user)) toggle_power(user) -/obj/item/device/suit_cooling_unit/proc/toggle_power(var/mob/user) +/obj/item/suit_cooling_unit/proc/toggle_power(var/mob/user) if(on) turn_off() else @@ -178,7 +178,7 @@ if(on) to_chat(user, SPAN_NOTICE("You switch on \the [src].")) -/obj/item/device/suit_cooling_unit/attackby(obj/item/attacking_item, mob/user) +/obj/item/suit_cooling_unit/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) if(cover_open) cover_open = FALSE @@ -205,7 +205,7 @@ return ..() -/obj/item/device/suit_cooling_unit/update_icon() +/obj/item/suit_cooling_unit/update_icon() ClearOverlays() if(cover_open) if(cell) @@ -241,5 +241,5 @@ M.update_inv_back() M.update_inv_s_store() -/obj/item/device/suit_cooling_unit/no_cell +/obj/item/suit_cooling_unit/no_cell celltype = null diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 3fe70d81430..25aab9dc419 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -1,9 +1,9 @@ #define OVERLAY_CACHE_LEN 50 -/obj/item/device/t_scanner +/obj/item/t_scanner name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." - icon = 'icons/obj/item/device/t_scanner.dmi' + icon = 'icons/obj/item/t_scanner.dmi' icon_state = "t-ray0" item_state = "t-ray" @@ -21,30 +21,30 @@ var/global/list/overlay_cache = list() //cache recent overlays -/obj/item/device/t_scanner/Destroy() +/obj/item/t_scanner/Destroy() . = ..() if(on) set_active(FALSE) -/obj/item/device/t_scanner/update_icon() +/obj/item/t_scanner/update_icon() icon_state = "t-ray[on]" -/obj/item/device/t_scanner/emp_act(severity) +/obj/item/t_scanner/emp_act(severity) . = ..() audible_message(src, SPAN_NOTICE("\The [src] buzzes oddly.")) set_active(FALSE) -/obj/item/device/t_scanner/attack_self(mob/user) +/obj/item/t_scanner/attack_self(mob/user) set_active(!on) user.update_action_buttons() -/obj/item/device/t_scanner/afterattack(atom/target, mob/user, proximity_flag, click_parameters) +/obj/item/t_scanner/afterattack(atom/target, mob/user, proximity_flag, click_parameters) var/obj/structure/disposalpipe/D = target if(istype(D)) to_chat(user, SPAN_INFO("Pipe segment integrity: [(D.health / 10) * 100]%")) -/obj/item/device/t_scanner/proc/set_active(var/active) +/obj/item/t_scanner/proc/set_active(var/active) on = active if(on) START_PROCESSING(SSprocessing, src) @@ -54,7 +54,7 @@ update_icon() //If reset is set, then assume the client has none of our overlays, otherwise we only send new overlays. -/obj/item/device/t_scanner/process() +/obj/item/t_scanner/process() if(!on) return @@ -88,7 +88,7 @@ active_scanned -= O //creates a new overlay for a scanned object -/obj/item/device/t_scanner/proc/get_overlay(obj/scanned) +/obj/item/t_scanner/proc/get_overlay(obj/scanned) //Use a cache so we don't create a whole bunch of new images just because someone's walking back and forth in a room. //Also means that images are reused if multiple people are using t-rays to look at the same objects. if(scanned in overlay_cache) @@ -117,7 +117,7 @@ if(overlay_cache.len > OVERLAY_CACHE_LEN) overlay_cache.Cut(1, overlay_cache.len-OVERLAY_CACHE_LEN-1) -/obj/item/device/t_scanner/proc/get_scanned_objects(var/scan_dist) +/obj/item/t_scanner/proc/get_scanned_objects(var/scan_dist) . = list() var/turf/center = get_turf(src.loc) @@ -137,7 +137,7 @@ . += O -/obj/item/device/t_scanner/proc/set_user_client(var/client/new_client) +/obj/item/t_scanner/proc/set_user_client(var/client/new_client) if(new_client == user_client) return if(user_client) @@ -151,7 +151,7 @@ user_client = new_client -/obj/item/device/t_scanner/dropped(mob/user) +/obj/item/t_scanner/dropped(mob/user) set_user_client(null) ..() diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index e3d2093fa95..f90d327f9e5 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -1,7 +1,7 @@ -/obj/item/device/taperecorder +/obj/item/taperecorder name = "universal recorder" desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." - icon = 'icons/obj/item/device/taperecorder.dmi' + icon = 'icons/obj/item/taperecorder.dmi' icon_state = "taperecorder_idle" item_state = "analyzer" w_class = WEIGHT_CLASS_SMALL @@ -22,18 +22,18 @@ throw_speed = 4 throw_range = 20 -/obj/item/device/taperecorder/Initialize() +/obj/item/taperecorder/Initialize() . = ..() become_hearing_sensitive(ROUNDSTART_TRAIT) portable_drive = new /obj/item/computer_hardware/hard_drive/portable(src) -/obj/item/device/taperecorder/Destroy() +/obj/item/taperecorder/Destroy() GLOB.listening_objects -= src if(portable_drive) QDEL_NULL(portable_drive) return ..() -/obj/item/device/taperecorder/hear_talk(mob/living/M, msg, var/verb = "says", datum/language/speaking = null) +/obj/item/taperecorder/hear_talk(mob/living/M, msg, var/verb = "says", datum/language/speaking = null) if(isanimal(M)) if(!M.universal_speak) return @@ -48,14 +48,14 @@ else stored_info += "\[[time2text(time_recorded*10,"mm:ss")]\] [M.name] [verb], \"[msg]\"" -/obj/item/device/taperecorder/see_emote(mob/M, text, var/emote_type) +/obj/item/taperecorder/see_emote(mob/M, text, var/emote_type) if(emote_type != 2) //only hearable emotes return if(recording) timestamp += time_recorded stored_info += "\[[time2text(time_recorded*10,"mm:ss")]\] [strip_html_properly(text)]" -/obj/item/device/taperecorder/show_message(msg, type, alt, alt_type) +/obj/item/taperecorder/show_message(msg, type, alt, alt_type) var/recordedtext if(msg && type == 2) //must be hearable recordedtext = msg @@ -67,7 +67,7 @@ timestamp += time_recorded stored_info += "*\[[time2text(time_recorded*10,"mm:ss")]\] *[strip_html_properly(recordedtext)]*" //"*" at front as a marker -/obj/item/device/taperecorder/emag_act(var/remaining_charges, mob/user) +/obj/item/taperecorder/emag_act(var/remaining_charges, mob/user) if(emagged) to_chat(user, SPAN_WARNING("It is already emagged!")) return FALSE @@ -77,7 +77,7 @@ icon_state = "taperecorder_idle" return TRUE -/obj/item/device/taperecorder/proc/explode() +/obj/item/taperecorder/proc/explode() var/turf/T = get_turf(loc) visible_message(SPAN_DANGER("\The [src] explodes!")) if(T) @@ -86,7 +86,7 @@ qdel(src) return -/obj/item/device/taperecorder/verb/record() +/obj/item/taperecorder/verb/record() set name = "Start Recording" set category = "Object.Tape Recorder" set src in usr @@ -114,7 +114,7 @@ else to_chat(usr, SPAN_NOTICE("Either your tape recorder's memory is full, or it is currently playing back its memory.")) -/obj/item/device/taperecorder/verb/stop() +/obj/item/taperecorder/verb/stop() set name = "Stop Recording" set category = "Object.Tape Recorder" set src in usr @@ -138,7 +138,7 @@ icon_state = "taperecorder_idle" return -/obj/item/device/taperecorder/verb/clear_memory() +/obj/item/taperecorder/verb/clear_memory() set name = "Clear Memory" set category = "Object.Tape Recorder" set src in usr @@ -161,7 +161,7 @@ to_chat(usr, SPAN_NOTICE("Memory cleared.")) return -/obj/item/device/taperecorder/verb/playback_memory() +/obj/item/taperecorder/verb/playback_memory() set name = "Playback Memory" set category = "Object.Tape Recorder" set src in usr @@ -212,7 +212,7 @@ sleep(15) explode() -/obj/item/device/taperecorder/verb/print_transcript() +/obj/item/taperecorder/verb/print_transcript() set name = "Print Transcript" set category = "Object.Tape Recorder" set src in usr @@ -243,10 +243,10 @@ can_print = FALSE addtimer(CALLBACK(src, PROC_REF(set_can_print), 1), 150) -/obj/item/device/taperecorder/proc/set_can_print(var/set_state = TRUE) +/obj/item/taperecorder/proc/set_can_print(var/set_state = TRUE) can_print = set_state -/obj/item/device/taperecorder/verb/eject_usb() +/obj/item/taperecorder/verb/eject_usb() set name = "Eject Portable Storage" set category = "Object.Tape Recorder" set src in usr @@ -276,7 +276,7 @@ usr.put_in_hands(portable_drive) portable_drive = null -/obj/item/device/taperecorder/attack_self(mob/user) +/obj/item/taperecorder/attack_self(mob/user) if(!recording && !playing) if(use_check_and_message(usr)) return @@ -320,7 +320,7 @@ icon_state = "taperecorder_idle" return -/obj/item/device/taperecorder/attackby(obj/item/attacking_item, mob/user) +/obj/item/taperecorder/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/computer_hardware/hard_drive/portable)) if(portable_drive) to_chat(user, SPAN_WARNING("\The [src] already has a portable drive!")) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 4d580c55481..7621b3e8f1c 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -14,10 +14,10 @@ effective or pretty fucking useless. */ -/obj/item/device/batterer +/obj/item/batterer name = "mind batterer" desc = "A strange device with twin antennas." - icon = 'icons/obj/item/device/batterer.dmi' + icon = 'icons/obj/item/batterer.dmi' icon_state = "batterer" item_state = "electronic" throwforce = 5 @@ -30,7 +30,7 @@ effective or pretty fucking useless. var/times_used = 0 //Number of times it's been used. var/max_uses = 2 -/obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) +/obj/item/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) to_chat(user, SPAN_WARNING("The mind batterer has been burnt out!")) @@ -53,17 +53,17 @@ effective or pretty fucking useless. if(times_used >= max_uses) icon_state = "battererburnt" -/obj/item/device/liidrafier //adminspawn/event injector, designed to easily make someone a lii'dra zombie/actual lii'dra +/obj/item/liidrafier //adminspawn/event injector, designed to easily make someone a lii'dra zombie/actual lii'dra name = "Lii'drafication Injector" desc = "Use this single-use injector on a Vaurca to grant them access to the Lii'dra Hivenet. Use it on an organic non-Vaurca to infect them with black k'ois. This is an OOC item, do not let anyone see it!" icon = 'icons/obj/guns/decloner.dmi' icon_state = "decloner" item_state = "decloner" -/obj/item/device/liidrafier/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/liidrafier/attack(mob/living/target_mob, mob/living/user, target_zone) return -/obj/item/device/liidrafier/afterattack(atom/A as mob, mob/user as mob) +/obj/item/liidrafier/afterattack(atom/A as mob, mob/user as mob) var/mob/living/carbon/human/target = A if(!istype(target)) to_chat(user, SPAN_NOTICE("[target] is not a valid target!")) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 0fa0f3cd22d..a7cb83264b4 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -1,20 +1,20 @@ -/obj/item/device/transfer_valve +/obj/item/transfer_valve name = "tank transfer valve" desc = "Regulates the transfer of air between two tanks" icon = 'icons/obj/assemblies.dmi' icon_state = "valve_1" var/obj/item/tank/tank_one var/obj/item/tank/tank_two - var/obj/item/device/assembly/attached_device + var/obj/item/assembly/attached_device var/mob/attacher = null var/valve_open = 0 var/toggle = 1 movable_flags = MOVABLE_FLAG_PROXMOVE -/obj/item/device/transfer_valve/IsAssemblyHolder() +/obj/item/transfer_valve/IsAssemblyHolder() return 1 -/obj/item/device/transfer_valve/attackby(obj/item/attacking_item, mob/user) +/obj/item/transfer_valve/attackby(obj/item/attacking_item, mob/user) var/turf/location = get_turf(src) // For admin logs if(istype(attacking_item, /obj/item/tank)) if(tank_one && tank_two) @@ -36,7 +36,7 @@ update_static_data_for_all_viewers() //TODO: Have this take an assemblyholder else if(isassembly(attacking_item)) - var/obj/item/device/assembly/A = attacking_item + var/obj/item/assembly/A = attacking_item if(A.secured) to_chat(user, SPAN_NOTICE("The device is secured.")) return @@ -58,23 +58,23 @@ return -/obj/item/device/transfer_valve/HasProximity(atom/movable/AM as mob|obj) +/obj/item/transfer_valve/HasProximity(atom/movable/AM as mob|obj) if(!attached_device) return attached_device.HasProximity(AM) return -/obj/item/device/transfer_valve/attack_self(mob/user as mob) +/obj/item/transfer_valve/attack_self(mob/user as mob) ui_interact(user) -/obj/item/device/transfer_valve/ui_interact(mob/user, datum/tgui/ui) +/obj/item/transfer_valve/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "TransferValve", ui_x=540, ui_y=165) ui.open() -/obj/item/device/transfer_valve/ui_data(mob/user) +/obj/item/transfer_valve/ui_data(mob/user) var/list/data = list() data["tankOne"] = tank_one ? tank_one.name : null data["tankTwo"] = tank_two ? tank_two.name : null @@ -82,7 +82,7 @@ data["valveOpen"] = valve_open ? 1 : 0 return data -/obj/item/device/transfer_valve/ui_act(action,params) +/obj/item/transfer_valve/ui_act(action,params) . = ..() if(.) return @@ -109,14 +109,14 @@ if(action=="open") toggle_valve() -/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D) +/obj/item/transfer_valve/proc/process_activation(var/obj/item/D) if(toggle) toggle = 0 toggle_valve() spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever toggle = 1 -/obj/item/device/transfer_valve/update_icon() +/obj/item/transfer_valve/update_icon() ClearOverlays() underlays = null @@ -134,7 +134,7 @@ if(attached_device) AddOverlays("device") -/obj/item/device/transfer_valve/proc/remove_tank(obj/item/tank/T, mob/user) +/obj/item/transfer_valve/proc/remove_tank(obj/item/tank/T, mob/user) if(tank_one == T) split_gases() tank_one = null @@ -149,7 +149,7 @@ user.put_in_hands(T) update_icon() -/obj/item/device/transfer_valve/proc/merge_gases() +/obj/item/transfer_valve/proc/merge_gases() if(valve_open) return tank_two.air_contents.volume += tank_one.air_contents.volume @@ -158,7 +158,7 @@ tank_two.air_contents.merge(temp) valve_open = 1 -/obj/item/device/transfer_valve/proc/split_gases() +/obj/item/transfer_valve/proc/split_gases() if(!valve_open) return @@ -179,7 +179,7 @@ it explodes properly when it gets a signal (and it does). */ -/obj/item/device/transfer_valve/proc/toggle_valve() +/obj/item/transfer_valve/proc/toggle_valve() if(!valve_open && (tank_one && tank_two)) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) @@ -214,5 +214,5 @@ // this doesn't do anything but the timer etc. expects it to be here // eventually maybe have it update icon to show state (timer, prox etc.) like old bombs -/obj/item/device/transfer_valve/proc/c_state() +/obj/item/transfer_valve/proc/c_state() return diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index ea8d7947e9c..fc5295c256e 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -1,27 +1,27 @@ -/obj/item/device/tvcamera +/obj/item/tvcamera name = "press camera drone" desc = "An Ingi Usang Entertainment Co. livestreaming press camera drone. Weapon of choice for war correspondents and reality show cameramen. It does not appear to have any internal memory storage." - icon = 'icons/obj/item/device/tvcamera.dmi' + icon = 'icons/obj/item/tvcamera.dmi' icon_state = "camcorder" item_state = "camcorder" w_class = WEIGHT_CLASS_BULKY slot_flags = SLOT_BELT var/channel = "General News Feed" var/obj/machinery/camera/network/news/camera - var/obj/item/device/radio/radio + var/obj/item/radio/radio -/obj/item/device/tvcamera/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/tvcamera/feedback_hints(mob/user, distance, is_adjacent) . += ..() . += "Video feed is currently: [camera.status ? "Online" : "Offline"]" . += "Audio feed is currently: [radio.get_broadcasting() ? "Online" : "Offline"]" -/obj/item/device/tvcamera/Destroy() +/obj/item/tvcamera/Destroy() GLOB.listening_objects -= src QDEL_NULL(camera) QDEL_NULL(radio) . = ..() -/obj/item/device/tvcamera/Initialize() +/obj/item/tvcamera/Initialize() camera = new(src) camera.c_tag = channel camera.status = FALSE @@ -31,7 +31,7 @@ GLOB.listening_objects += src . = ..() -/obj/item/device/tvcamera/attack_self(mob/user) +/obj/item/tvcamera/attack_self(mob/user) add_fingerprint(user) user.set_machine(src) var/dat = list() @@ -43,7 +43,7 @@ popup.set_content(jointext(dat,null)) popup.open() -/obj/item/device/tvcamera/Topic(bred, href_list, state = GLOB.physical_state) +/obj/item/tvcamera/Topic(bred, href_list, state = GLOB.physical_state) if(..()) return 1 if(href_list["channel"]) @@ -76,7 +76,7 @@ if(!href_list["close"]) attack_self(usr) -/obj/item/device/tvcamera/update_icon() +/obj/item/tvcamera/update_icon() ..() if(camera.status) icon_state = "camcorder_on" @@ -109,7 +109,7 @@ Using robohead because of restricting to roboticist */ desc = "This TV camera assembly has a camera module." buildstep++ if(1) - if(istype(attacking_item, /obj/item/device/taperecorder)) + if(istype(attacking_item, /obj/item/taperecorder)) qdel(attacking_item) buildstep++ to_chat(user, SPAN_NOTICE("You add the tape recorder to [src].")) @@ -139,7 +139,7 @@ Using robohead because of restricting to roboticist */ buildstep++ to_chat(user, SPAN_NOTICE("You encase the assembly.")) var/turf/T = get_turf(src) - new /obj/item/device/tvcamera(T) + new /obj/item/tvcamera(T) qdel(src) return ..() diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index c1363bf1c17..210c6bfc0e0 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -6,7 +6,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid */ -/obj/item/device/uplink +/obj/item/uplink /// Welcoming menu message. var/welcome = "Welcome, Operative" /// Number of telecrystals. @@ -32,10 +32,10 @@ A list of items and costs is stored under the datum of every game mode, alongsid /// Mind of the uplink's owner. var/datum/mind/uplink_owner = null -/obj/item/device/uplink/ui_host() +/obj/item/uplink/ui_host() return loc -/obj/item/device/uplink/Initialize(var/mapload, var/datum/mind/owner, var/new_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT, var/new_bluecrystals = DEFAULT_BLUECRYSTAL_AMOUNT) +/obj/item/uplink/Initialize(var/mapload, var/datum/mind/owner, var/new_telecrystals = DEFAULT_TELECRYSTAL_AMOUNT, var/new_bluecrystals = DEFAULT_BLUECRYSTAL_AMOUNT) . = ..() src.uplink_owner = owner purchase_log = list() @@ -43,7 +43,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid telecrystals = new_telecrystals bluecrystals = new_bluecrystals -/obj/item/device/uplink/Destroy() +/obj/item/uplink/Destroy() GLOB.world_uplinks -= src src.uplink_owner = null return ..() @@ -60,7 +60,7 @@ The var/value is the value that will be compared with the var/target. If they ar Then check if it's true, if true return. This will stop the normal menu appearing and will instead show the uplink menu. */ -/obj/item/device/uplink/hidden +/obj/item/uplink/hidden name = "hidden uplink" desc = "There is something wrong if you're examining this." var/active = 0 @@ -74,26 +74,26 @@ Then check if it's true, if true return. This will stop the normal menu appearin var/pda_code = "" -/obj/item/device/uplink/hidden/New() +/obj/item/uplink/hidden/New() ..() tgui_data = list() update_tgui_data() -/obj/item/device/uplink/hidden/Initialize(mapload, datum/mind/owner, new_telecrystals, new_bluecrystals) +/obj/item/uplink/hidden/Initialize(mapload, datum/mind/owner, new_telecrystals, new_bluecrystals) . = ..() return INITIALIZE_HINT_LATELOAD -/obj/item/device/uplink/hidden/LateInitialize() +/obj/item/uplink/hidden/LateInitialize() // The hidden uplink MUST be inside an obj/item's contents. if(!istype(loc, /obj/item)) qdel(src) // Toggles the uplink on and off. Normally this will bypass the item's normal functions and go to the uplink menu, if activated. -/obj/item/device/uplink/hidden/proc/toggle() +/obj/item/uplink/hidden/proc/toggle() active = !active // Directly trigger the uplink. Turn on if it isn't already. -/obj/item/device/uplink/hidden/proc/trigger(mob/user as mob) +/obj/item/uplink/hidden/proc/trigger(mob/user as mob) if(!active) toggle() interact(user) @@ -101,7 +101,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin // Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset. // If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the // current item's menu. -/obj/item/device/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target) +/obj/item/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target) if(value == target) trigger(user) return 1 @@ -110,13 +110,13 @@ Then check if it's true, if true return. This will stop the normal menu appearin /* TGUI FOR UPLINK WOOP WOOP */ -/obj/item/device/uplink/hidden/ui_interact(mob/user, datum/tgui/ui) +/obj/item/uplink/hidden/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Uplink", capitalize_first_letters(name)) ui.open() -/obj/item/device/uplink/hidden/ui_data(mob/user) +/obj/item/uplink/hidden/ui_data(mob/user) var/list/data = list() data["welcome"] = welcome data["telecrystals"] = telecrystals @@ -127,10 +127,10 @@ Then check if it's true, if true return. This will stop the normal menu appearin return data // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button. -/obj/item/device/uplink/hidden/interact(mob/user) +/obj/item/uplink/hidden/interact(mob/user) ui_interact(user, null) -/obj/item/device/uplink/hidden/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/uplink/hidden/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) if(..()) return 1 @@ -159,7 +159,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin return 1 -/obj/item/device/uplink/hidden/proc/new_tgui_item_data(var/datum/uplink_item/item) +/obj/item/uplink/hidden/proc/new_tgui_item_data(var/datum/uplink_item/item) var/tc_cost = item.telecrystal_cost(telecrystals) var/bc_cost = item.bluecrystal_cost(bluecrystals) var/can_buy = item.can_buy_telecrystals(src) || item.can_buy_bluecrystals(src) @@ -174,7 +174,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin ) return newItem -/obj/item/device/uplink/hidden/proc/update_tgui_data() +/obj/item/uplink/hidden/proc/update_tgui_data() if(tgui_menu == 0) var/list/categories = list() var/list/items = list() @@ -342,25 +342,25 @@ Then check if it's true, if true return. This will stop the normal menu appearin // Includes normal radio uplink, multitool uplink, // implant uplink (not the implant tool) and a preset headset uplink. -/obj/item/device/radio/uplink/New(var/loc, var/mind) +/obj/item/radio/uplink/New(var/loc, var/mind) hidden_uplink = new(src, mind) icon_state = "radio" -/obj/item/device/radio/uplink/attack_self(mob/user as mob) +/obj/item/radio/uplink/attack_self(mob/user as mob) if(hidden_uplink) hidden_uplink.trigger(user) -/obj/item/device/multitool/uplink/New(var/loc, var/mind) +/obj/item/multitool/uplink/New(var/loc, var/mind) hidden_uplink = new(src, mind) -/obj/item/device/multitool/uplink/attack_self(mob/user as mob) +/obj/item/multitool/uplink/attack_self(mob/user as mob) if(hidden_uplink) hidden_uplink.trigger(user) -/obj/item/device/radio/headset/uplink +/obj/item/radio/headset/uplink traitor_frequency = 1445 -/obj/item/device/radio/headset/uplink/New(var/loc, var/mind) +/obj/item/radio/headset/uplink/New(var/loc, var/mind) ..() hidden_uplink = new(src, mind) hidden_uplink.telecrystals = DEFAULT_TELECRYSTAL_AMOUNT @@ -370,7 +370,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin * A simple device for accessing the SQL based contract database */ -/obj/item/device/contract_uplink +/obj/item/contract_uplink name = "contract uplink" desc = "A small device used for access restricted sites in the remote corners of the Extranet." icon = 'icons/obj/radio.dmi' @@ -378,31 +378,31 @@ Then check if it's true, if true return. This will stop the normal menu appearin obj_flags = OBJ_FLAG_CONDUCTABLE w_class = WEIGHT_CLASS_SMALL -/obj/item/device/contract_uplink/Initialize(var/mapload, var/mind) +/obj/item/contract_uplink/Initialize(var/mapload, var/mind) . = ..() hidden_uplink = new(src, mind) hidden_uplink.telecrystals = 0 hidden_uplink.bluecrystals = 0 hidden_uplink.tgui_menu = 3 -/obj/item/device/contract_uplink/attack_self(mob/user as mob) +/obj/item/contract_uplink/attack_self(mob/user as mob) if (hidden_uplink) hidden_uplink.trigger(user) //for revs to create their own central command reports -/obj/item/device/announcer +/obj/item/announcer name = "relay positioning device" - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps" item_state = "radio" w_class = WEIGHT_CLASS_SMALL -/obj/item/device/announcer/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/announcer/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "This device allows you to create a single Central Command report. It has only one use." -/obj/item/device/announcer/attack_self(mob/user as mob) +/obj/item/announcer/attack_self(mob/user as mob) if(!player_is_antag(user.mind)) return @@ -418,7 +418,7 @@ Then check if it's true, if true return. This will stop the normal menu appearin SSdiscord.send_to_cciaa("Announcer - Fake announcement:`[title]` - `[message]`, sent by [user]!") qdel(src) -/obj/item/device/special_uplink +/obj/item/special_uplink name = "special uplink" desc = "A small device with knobs and switches." icon = 'icons/obj/radio.dmi' @@ -432,12 +432,12 @@ Then check if it's true, if true return. This will stop the normal menu appearin ///Amount of starting bluecrystals, used to buy support/medical/gimmick items. Defaults to default amount if not set. var/starting_bluecrystals -/obj/item/device/special_uplink/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/special_uplink/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "This is hidden uplink! Use it in-hand to access the uplink interface and spend telecrystals to beam in items." . += "Take care to only use it in private; it could look suspicious." -/obj/item/device/special_uplink/New(var/loc, var/mind) +/obj/item/special_uplink/New(var/loc, var/mind) ..() hidden_uplink = new(src, mind) if(!starting_telecrystals) @@ -450,31 +450,31 @@ Then check if it's true, if true return. This will stop the normal menu appearin hidden_uplink.bluecrystals = DEFAULT_BLUECRYSTAL_AMOUNT hidden_uplink.tgui_menu = 1 -/obj/item/device/special_uplink/attack_self(mob/user as mob) +/obj/item/special_uplink/attack_self(mob/user as mob) if(hidden_uplink) hidden_uplink.trigger(user) -/obj/item/device/special_uplink/ninja +/obj/item/special_uplink/ninja name = "infiltrator uplink" starting_telecrystals = 15 -/obj/item/device/special_uplink/mercenary +/obj/item/special_uplink/mercenary name = "milspec uplink" starting_telecrystals = 15 -/obj/item/device/special_uplink/burglar +/obj/item/special_uplink/burglar name = "sponsored uplink" starting_telecrystals = 20 -/obj/item/device/special_uplink/jockey +/obj/item/special_uplink/jockey name = "jockey uplink" starting_telecrystals = 10 -/obj/item/device/special_uplink/raider +/obj/item/special_uplink/raider name = "underground uplink" starting_telecrystals = 3 -/obj/item/device/special_uplink/rev +/obj/item/special_uplink/rev name = "shortwave radio" desc = null // SBRs have no desc icon_state = "walkietalkie" // more incognito diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm index 9dfc0dce783..7945b6cb7e2 100644 --- a/code/game/objects/items/devices/uplink_random_lists.dm +++ b/code/game/objects/items/devices/uplink_random_lists.dm @@ -19,7 +19,7 @@ ABSTRACT_TYPE(/datum/uplink_random_selection) ..() items = list() -/datum/uplink_random_selection/proc/get_random_item(var/telecrystals, obj/item/device/uplink/U, var/list/bought_items) +/datum/uplink_random_selection/proc/get_random_item(var/telecrystals, obj/item/uplink/U, var/list/bought_items) var/const/attempts = 50 for(var/i = 0; i < attempts; i++) diff --git a/code/game/objects/items/devices/versebook.dm b/code/game/objects/items/devices/versebook.dm index f0f3ade7b6f..61af3e53b69 100644 --- a/code/game/objects/items/devices/versebook.dm +++ b/code/game/objects/items/devices/versebook.dm @@ -1,4 +1,4 @@ -/obj/item/device/versebook +/obj/item/versebook name = "\improper versebook" desc = "If you see this, someone fucked up. Make a issue request." desc_extended = "No, seriously. Make a issue request" @@ -16,7 +16,7 @@ /// takes `file2list(FILE.txt)`. Each line in the .txt file is a verse that is randomly selected var/list/randomquip = list() -/obj/item/device/versebook/attack_self(mob/user) +/obj/item/versebook/attack_self(mob/user) if(!length(randomquip)) return user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) @@ -36,51 +36,51 @@ to_chat(user, SPAN_NOTICE("You notice a particular verse: [q]")) reading = FALSE -/obj/item/device/versebook/tribunal +/obj/item/versebook/tribunal name = "\improper tribunal codex" desc = "A holy text of the Moroz Holy Tribunal, the state religion of the Empire of Dominia." desc_extended = "An almost mandatory possession for any Dominian household, containing a list of edicts, litanies, and rituals." icon_state = "dominiabook" item_state = "dominia" -/obj/item/device/versebook/tribunal/Initialize() +/obj/item/versebook/tribunal/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/dominia.txt') //Needs a .txt file, each line is a 'verse' the book will randomly choose to display to user. -/obj/item/device/versebook/gadpathur +/obj/item/versebook/gadpathur name = "\improper gadpathurian morale manual" desc = "A popular Gadpathurian pocket guide, used to carry a fragment of the Commander's wisdom abroad." desc_extended = "Manufactured using recycled paper and canvas. The wisdom within the text is based on the collected speeches of Commander Patvardhan and her assorted councillors." icon_state = "gadpathurbook" item_state = "gadpathur" -/obj/item/device/versebook/gadpathur/Initialize() +/obj/item/versebook/gadpathur/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/gadpathur.txt') -/obj/item/device/versebook/biesel +/obj/item/versebook/biesel name = "\improper Constitution of The Federal Republic of Biesel" desc = "A common possession by Biesel government officals, the printed text of the constitution for the Federal Republic of Biesel and the Corporate Reconstruction Zone, adopted in 2452." desc_extended = "This book has the Republic of Biesel's iconic symbol etched on the cover, the text within details the structure of the Federal Democracy the Republic is today." icon_state = "bieselbook" item_state = "biesel" -/obj/item/device/versebook/biesel/Initialize() +/obj/item/versebook/biesel/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/biesel.txt') -/obj/item/device/versebook/trinary +/obj/item/versebook/trinary name = "\improper The Order (abdridged version)" desc = "The holy text of the Trinary Perfection, who believe in synthetic perfection and eventual salvation." desc_extended = "This book contains some verses of the core beliefs of the Trinary Perfection, including some of the original works by the Corkfells, some additions by the prophet-like figure Flock, and a few recent additions by Ecclesiarch ARM-1DRIL. This is the abridged version, with only the core beliefs present." icon_state = "trinarybook" item_state = "trinary" -/obj/item/device/versebook/trinary/Initialize() +/obj/item/versebook/trinary/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/trinary.txt') -/obj/item/device/versebook/templeist +/obj/item/versebook/templeist name = "\improper The Voice of Temple (abdridged version)" desc = "The holy text of the Lodge of Temple Architect, an order within the Trinary Perfection that seeks to attain its goals via technological advancement and scientific discovery." desc_extended = "This book contains some of the words of Temple, a sacred AI within the Trinary Perfection and namesake of the Lodge of the Temple Architect. It also includes some teachings by leading members within the sect. Due to its recent establishment, this book is frequently changed and amended \ @@ -88,11 +88,11 @@ icon_state = "templeistbook" item_state = "templeist" -/obj/item/device/versebook/templeist/Initialize() +/obj/item/versebook/templeist/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/templeist.txt') -/obj/item/device/versebook/siakh +/obj/item/versebook/siakh name = "\improper Writings of Judizah Si'akh" desc = "A collection of musings, commands and theological discussions, copied many times over from the alleged words of the controversial prophet Judizah Si'akh himself." desc_extended = "As close to a 'holy text' as the Si'akh faith has, this book can be found across Moghes and rarely beyond, despite efforts of the nobility to stamp out the firebrand religion. It lays down the \ @@ -100,11 +100,11 @@ icon_state = "holybook" item_state = "book1" -/obj/item/device/versebook/siakh/Initialize() +/obj/item/versebook/siakh/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/siakh.txt') -/obj/item/device/versebook/autakh +/obj/item/versebook/autakh name = "\improper Reflections upon the Aut'akh Faith" desc = "An illegal tome in the Izweski Hegemony, Reflections is a short book penned by the Unathi known as Emzal Paossini, known by Aut'akh as 'Creator of Paradigms', infamous for their role in the creation of the Aut'akh faith." desc_extended = "The Aut'akh faith is highly decentralised and does not have holy texts per se. This book is simply a collection of personal musings from one of the Aut'akh's most influential figures.\ @@ -112,11 +112,11 @@ icon_state = "book10" item_state = "book10" -/obj/item/device/versebook/autakh/Initialize() +/obj/item/versebook/autakh/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/autakh.txt') -/obj/item/device/versebook/skakh +/obj/item/versebook/skakh name = "\improper Sk'akh Legends" desc = "This is a collection of legends, commandments and doctrines of the Sk'akh faith, published by the Church." desc_extended = "Variations of this tome have been published for centuries, in one form or another, often changing to deal with recent developments for the Unathi people. This variation looks to have been published \ @@ -124,22 +124,22 @@ icon_state = "book3" item_state = "book3" -/obj/item/device/versebook/skakh/Initialize() +/obj/item/versebook/skakh/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/skakh.txt') -/obj/item/device/versebook/thakh +/obj/item/versebook/thakh name = "\improper collected Th'akh fables" desc = "Th'akh is a decentralised religion, with thousands of variants across Moghes and beyond. This book is a collection of common ancient tales and fables, translated from an archaic form of Sinta'Azaziba into Basic." desc_extended = "The tales of various Th'akh sects are numbered beyond count. This particular copy seems to be written by a shaman of the Court of Stars, and the names of their spirit-gods often crop up throughout the text." icon_state = "holybook" item_state = "book1" -/obj/item/device/versebook/thakh/Initialize() +/obj/item/versebook/thakh/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/thakh.txt') -/obj/item/device/versebook/assunzione +/obj/item/versebook/assunzione name = "\improper Luceian Book of Scripture" desc = "A collection of historically-backed texts mixed with fables and stories detailing the reasonings, history, and beliefs of the Luceism religion of Assunzione. Translated into Basic by the Luceian Monastery on Biesel." desc_extended = "Luceism's founding was unusually well-documented for a religion, and as a result this book features several photographs of cataclysmic events that happened during Assunzione's crisis \ @@ -147,11 +147,11 @@ icon_state = "luce" item_state = "luce" -/obj/item/device/versebook/assunzione/Initialize() +/obj/item/versebook/assunzione/Initialize() . = ..() randomquip = file2list('texts/ingame_manuals/assunzione.txt') -/obj/item/device/versebook/assunzione/pocket +/obj/item/versebook/assunzione/pocket name = "pocket Luceian Book of Scripture" desc = "A miniaturized edition of the Luceian Book of Scripture, a collection of historically-backed texts mixed with fables and stories detailing the reasonings, history, and \ beliefs of the Luceism religion of Assunzione. Translated into Basic by the Luceian Monastery on Biesel. This one fits nicely in a pocket or in a bag." @@ -160,7 +160,7 @@ /// Tajaran Political Books -/obj/item/device/versebook/pra +/obj/item/versebook/pra name = "\improper Hadiist Manifesto" desc = "A compact red book that outlines the principles of Hadiism, required reading for PRA citizens." desc_extended = "A political document supposedly written by Al’mari Hadii after the First Revolution. It is regarded as the foundation of the Hadiist Ideology. \ @@ -169,11 +169,11 @@ icon_state = "prabook" item_state = "pra" -/obj/item/device/versebook/pra/Initialize() +/obj/item/versebook/pra/Initialize() . = ..() randomquip = file2list("texts/ingame_manuals/hadiism.txt") -/obj/item/device/versebook/dpra +/obj/item/versebook/dpra name = "\improper In Defense of Al'mari's Legacy" desc = "The manifesto of the Democratic People’s Republic of Adhomai’s founder, Supreme Commander Nated." desc_extended = "the political manifesto that laid the foundations of the Al’mariist ideology, written by Supreme Commander Nated briefly after the coup attempt. \ @@ -182,11 +182,11 @@ icon_state = "dprabook" item_state = "dpra" -/obj/item/device/versebook/dpra/Initialize() +/obj/item/versebook/dpra/Initialize() . = ..() randomquip = file2list("texts/ingame_manuals/almariism.txt") -/obj/item/device/versebook/nka +/obj/item/versebook/nka name = "\improper The New Kingdom" desc = "This is a political text written by the New Kingdom of Adhomai’s first King Vahzirthaamro Azunja." desc_extended = "a political text written by King Vahzirthaamro Azunja during his time in hiding. \ @@ -196,13 +196,13 @@ icon_state = "nkabook" item_state = "nka" -/obj/item/device/versebook/nka/Initialize() +/obj/item/versebook/nka/Initialize() . = ..() randomquip = file2list("texts/ingame_manuals/royalism.txt") /// Tajaran Religious Texts -/obj/item/device/versebook/twinsuns +/obj/item/versebook/twinsuns name = "\improper Holy Scrolls" desc = "An abridged collection of teachings for those worshipers of S’rendarr and Messa." desc_extended = "Books and teachings of the S’randmarr worship have seen numerous variations over the storied existence of the faith. \ @@ -211,11 +211,11 @@ icon_state = "twinsunsbook" item_state = "twinsuns" -/obj/item/device/versebook/twinsuns/Initialize() +/obj/item/versebook/twinsuns/Initialize() . = ..() randomquip = file2list("texts/ingame_manuals/twinsuns.txt") -/obj/item/device/versebook/matake +/obj/item/versebook/matake name = "\improper Ma'ta'ke legends" desc = "An abridged collection of stories and teachings from the Ma’ta’ke gods." desc_extended = "The Ma’ta’ke Gods and their worship has never been organized, \ @@ -224,6 +224,6 @@ icon_state = "matakebook" item_state = "matake" -/obj/item/device/versebook/matake/Initialize() +/obj/item/versebook/matake/Initialize() . = ..() randomquip = file2list("texts/ingame_manuals/matake.txt") diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 3a8f6e99fb4..fc87ec7bbbe 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -1,7 +1,7 @@ -/obj/item/device/hailer +/obj/item/hailer name = "hailer" desc = "Used by obese officers to save their breath for running." - icon = 'icons/obj/item/device/hailer.dmi' + icon = 'icons/obj/item/hailer.dmi' icon_state = "voice0" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) w_class = WEIGHT_CLASS_TINY @@ -11,7 +11,7 @@ var/spamcheck = 0 var/insults -/obj/item/device/hailer/verb/set_message() +/obj/item/hailer/verb/set_message() set name = "Set Hailer Message" set category = "Object.Held" set desc = "Alter the message shouted by your hailer." @@ -29,7 +29,7 @@ to_chat(usr, "You configure the hailer to shout \"[use_message]\".") -/obj/item/device/hailer/attack_self(mob/living/carbon/user as mob) +/obj/item/hailer/attack_self(mob/living/carbon/user as mob) if (spamcheck) return @@ -48,7 +48,7 @@ spawn(20) spamcheck = 0 -/obj/item/device/hailer/emag_act(var/remaining_charges, var/mob/user) +/obj/item/hailer/emag_act(var/remaining_charges, var/mob/user) if(isnull(insults)) to_chat(user, SPAN_DANGER("You overload \the [src]'s voice synthesizer.")) insults = rand(1, 3)//to prevent dickflooding diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 47f58cd5660..802270c1d22 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -1,5 +1,5 @@ -/obj/item/device/kit - icon = 'icons/obj/item/device/modkit.dmi' +/obj/item/kit + icon = 'icons/obj/item/modkit.dmi' icon_state = "modkit" item_state = "restock_unit" var/new_name = "exosuit" //What is the variant called? @@ -8,11 +8,11 @@ var/new_icon_file var/uses = 1 // Uses before the kit deletes itself. -/obj/item/device/kit/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/kit/feedback_hints(mob/user, distance, is_adjacent) . += ..() . += "It has [uses] use\s left." -/obj/item/device/kit/use(var/amt, var/mob/user) +/obj/item/kit/use(var/amt, var/mob/user) uses -= amt playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1) if(uses<1) @@ -21,7 +21,7 @@ // Root voidsuit kit defines. // Icons for modified voidsuits need to be in the proper .dmis because suit cyclers may cock them up. -/obj/item/device/kit/suit +/obj/item/kit/suit name = "voidsuit modification kit" desc = "A kit for modifying a voidsuit." uses = 2 @@ -29,8 +29,8 @@ var/new_mob_icon_file /obj/item/clothing/head/helmet/space/void/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item,/obj/item/device/kit/suit)) - var/obj/item/device/kit/suit/kit = attacking_item + if(istype(attacking_item,/obj/item/kit/suit)) + var/obj/item/kit/suit/kit = attacking_item name = "[kit.new_name] suit helmet" desc = kit.new_desc icon_state = "[kit.new_icon]_helmet" diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 0ff7b09f239..9dbb20491cf 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -286,7 +286,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) text = lightermes else if(attacking_item.tool_behaviour == TOOL_WELDER) text = weldermes - else if(istype(attacking_item, /obj/item/device/assembly/igniter)) + else if(istype(attacking_item, /obj/item/assembly/igniter)) text = ignitermes else text = genericmes @@ -670,7 +670,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) if(M.lit) light(SPAN_NOTICE("[user] lights their [name] with their [attacking_item].")) - else if(istype(attacking_item, /obj/item/device/assembly/igniter)) + else if(istype(attacking_item, /obj/item/assembly/igniter)) light(SPAN_NOTICE("[user] fiddles with [attacking_item], and manages to light their [name] with the power of science.")) user.update_inv_wear_mask(0) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm b/code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm index 1f416204dc8..cdbdd8e6bed 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm @@ -52,7 +52,7 @@ req_components = list( "/obj/item/stock_parts/capacitor" = 1, "/obj/item/stock_parts/scanning_module" = 1, - "/obj/item/device/healthanalyzer" = 1) + "/obj/item/healthanalyzer" = 1) /obj/item/circuitboard/bodyscannerconsole name = T_BOARD("Body Scanner Console") diff --git a/code/game/objects/items/weapons/cloaking_device.dm b/code/game/objects/items/weapons/cloaking_device.dm index b8c7445b2ad..add8aac6e7f 100644 --- a/code/game/objects/items/weapons/cloaking_device.dm +++ b/code/game/objects/items/weapons/cloaking_device.dm @@ -1,7 +1,7 @@ /obj/item/cloaking_device name = "cloaking device" desc = "Use this to become invisible to the human eye. Contains a removable power cell behind a screwed compartment" - icon = 'icons/obj/item/device/chameleon.dmi' + icon = 'icons/obj/item/chameleon.dmi' icon_state = "shield0" item_state = "electronic" contained_sprite = TRUE diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index f6e310c24a3..ab8d8d7452e 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -23,7 +23,7 @@ var/lit = FALSE //on or off var/operating = FALSE //cooldown var/obj/item/weldingtool/welding_tool = null - var/obj/item/device/assembly/igniter/igniter = null + var/obj/item/assembly/igniter/igniter = null var/obj/item/reagent_containers/fuel_container = null /// How much range the flamethrower has. Upgraded welding tools increase this. var/range = 4 @@ -149,7 +149,7 @@ return TRUE else if(isigniter(attacking_item)) - var/obj/item/device/assembly/igniter/I = attacking_item + var/obj/item/assembly/igniter/I = attacking_item if(I.secured) to_chat(user, SPAN_WARNING("\The [I] is not ready to attach yet! Use a screwdriver on it first.")) return TRUE @@ -310,7 +310,7 @@ /obj/item/flamethrower/full/Initialize() // slightly weird looking initialize cuz it has to do some stuff first welding_tool = new /obj/item/weldingtool(src) welding_tool.status = FALSE - igniter = new /obj/item/device/assembly/igniter(src) + igniter = new /obj/item/assembly/igniter(src) igniter.secured = FALSE secured = TRUE fuel_container = new /obj/item/reagent_containers/glass/beaker/large(src) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 91ac2eede11..2ce95daf84f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -10,7 +10,7 @@ var/stage = 0 var/state = 0 var/path = 0 - var/obj/item/device/assembly_holder/detonator = null + var/obj/item/assembly_holder/detonator = null var/list/beakers = list() var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle) var/affected_area = 3 @@ -61,8 +61,8 @@ /obj/item/grenade/chem_grenade/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2) - var/obj/item/device/assembly_holder/det = attacking_item + if(istype(attacking_item,/obj/item/assembly_holder) && (!stage || stage==1) && path != 2) + var/obj/item/assembly_holder/det = attacking_item if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right))) to_chat(user, SPAN_WARNING("Assembly must contain one igniter.")) return @@ -76,10 +76,10 @@ det.forceMove(src) detonator = det if(istimer(detonator.a_left)) - var/obj/item/device/assembly/timer/T = detonator.a_left + var/obj/item/assembly/timer/T = detonator.a_left det_time = 10*T.time if(istimer(detonator.a_right)) - var/obj/item/device/assembly/timer/T = detonator.a_right + var/obj/item/assembly/timer/T = detonator.a_right det_time = 10*T.time icon_state = initial(icon_state) +"_ass" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" @@ -159,10 +159,10 @@ playsound(src.loc, 'sound/items/Screwdriver2.ogg', 50, 1) spawn(0) //Otherwise det_time is erroneously set to 0 after this if(istimer(detonator.a_left)) //Make sure description reflects that the timer has been reset - var/obj/item/device/assembly/timer/T = detonator.a_left + var/obj/item/assembly/timer/T = detonator.a_left det_time = 10*T.time if(istimer(detonator.a_right)) - var/obj/item/device/assembly/timer/T = detonator.a_right + var/obj/item/assembly/timer/T = detonator.a_right det_time = 10*T.time return @@ -216,7 +216,7 @@ B2.reagents.add_reagent(/singleton/reagent/foaming_agent, 10) B2.reagents.add_reagent(/singleton/reagent/acid/polyacid, 10) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -239,7 +239,7 @@ B2.reagents.add_reagent(/singleton/reagent/acid, 15) B1.reagents.add_reagent(/singleton/reagent/fuel,20) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -261,7 +261,7 @@ B2.reagents.add_reagent(/singleton/reagent/phosphorus, 25) B2.reagents.add_reagent(/singleton/reagent/sugar, 25) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -285,7 +285,7 @@ B2.reagents.add_reagent(/singleton/reagent/polysomnine,40) B2.reagents.add_reagent(/singleton/reagent/phosphorus,20) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -306,7 +306,7 @@ B2.reagents.add_reagent(/singleton/reagent/water, 40) B2.reagents.add_reagent(/singleton/reagent/spacecleaner, 10) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -327,7 +327,7 @@ B2.reagents.add_reagent(/singleton/reagent/water, 40) B2.reagents.add_reagent(/singleton/reagent/antifuel, 10) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -349,7 +349,7 @@ B2.reagents.add_reagent(/singleton/reagent/phosphorus, 40) B2.reagents.add_reagent(/singleton/reagent/sugar, 40) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -373,7 +373,7 @@ B2.reagents.add_reagent(/singleton/reagent/sugar, 40) B2.reagents.add_reagent(/singleton/reagent/capsaicin/condensed, 80) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -395,7 +395,7 @@ B2.reagents.add_reagent(/singleton/reagent/water, 40) B2.reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, 20) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) beakers += B1 beakers += B2 @@ -419,9 +419,9 @@ B2.reagents.add_reagent(/singleton/reagent/sugar, 40) B2.reagents.add_reagent(/singleton/reagent/toxin/hylemnomil, 80) - detonator = new/obj/item/device/assembly_holder/timer_igniter(src) + detonator = new/obj/item/assembly_holder/timer_igniter(src) - var/obj/item/device/assembly/timer/tmr = detonator.a_left + var/obj/item/assembly/timer/tmr = detonator.a_left tmr.time = 2 detonator.name = "[initial(detonator.name)] ([tmr.time] secs)" diff --git a/code/game/objects/items/weapons/implants/implants/circuit.dm b/code/game/objects/items/weapons/implants/implants/circuit.dm index d9eae5bbf6b..beec752227f 100644 --- a/code/game/objects/items/weapons/implants/implants/circuit.dm +++ b/code/game/objects/items/weapons/implants/implants/circuit.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/assemblies/electronic_setups.dmi' icon_state = "setup_implant" known = TRUE - var/obj/item/device/electronic_assembly/implant/IC = null + var/obj/item/electronic_assembly/implant/IC = null /obj/item/implant/integrated_circuit/isLegal() return TRUE @@ -44,7 +44,7 @@ return IC.examine(user, distance, is_adjacent, infix, suffix, show_extended) /obj/item/implant/integrated_circuit/attackby(obj/item/attacking_item, mob/user) - if(attacking_item.tool_behaviour == TOOL_CROWBAR || istype(attacking_item, /obj/item/device/integrated_electronics) || istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.tool_behaviour == TOOL_SCREWDRIVER || istype(attacking_item, /obj/item/cell/device) ) + if(attacking_item.tool_behaviour == TOOL_CROWBAR || istype(attacking_item, /obj/item/integrated_electronics) || istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.tool_behaviour == TOOL_SCREWDRIVER || istype(attacking_item, /obj/item/cell/device) ) IC.attackby(attacking_item, user) else ..() diff --git a/code/game/objects/items/weapons/landmines.dm b/code/game/objects/items/weapons/landmines.dm index ce1332fd742..06012dfd8a1 100644 --- a/code/game/objects/items/weapons/landmines.dm +++ b/code/game/objects/items/weapons/landmines.dm @@ -458,7 +458,7 @@ icon = 'icons/obj/item/landmine/claymore.dmi' icon_state = "m20" var/datum/wires/landmine/claymore/trigger_wire - var/obj/item/device/assembly/signaler/signaler + var/obj/item/assembly/signaler/signaler /obj/item/landmine/claymore/mechanics_hints(mob/user, distance, is_adjacent) . += ..() @@ -478,7 +478,7 @@ icon_state = (src.deployed) ? "[initial(icon_state)]_active" : initial(icon_state) /obj/item/landmine/claymore/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/assembly/signaler)) + if(istype(attacking_item, /obj/item/assembly/signaler)) if(!isnull(signaler)) to_chat(user, SPAN_NOTICE("There is already a signaler inserted in \the [src].")) return diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index e95b9dc4155..858c6c58e16 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -56,9 +56,9 @@ else icon_state = "trashbag3" /obj/item/storage/bag/trash/attackby(obj/item/attacking_item, mob/user) - if (istype (attacking_item, /obj/item/device/lightreplacer)) + if (istype (attacking_item, /obj/item/lightreplacer)) var/count = 0 - var/obj/item/device/lightreplacer/R = attacking_item + var/obj/item/lightreplacer/R = attacking_item var/bagfull = 0 if (R.store_broken) for(var/obj/item/light/L in R.contents) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index a216df17dd0..cf9c825e7d6 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -97,32 +97,32 @@ /obj/item/wirecutters, /obj/item/wrench, /obj/item/hammer, - /obj/item/device/multitool, - /obj/item/device/flashlight, + /obj/item/multitool, + /obj/item/flashlight, /obj/item/stack/cable_coil, - /obj/item/device/t_scanner, - /obj/item/device/analyzer, + /obj/item/t_scanner, + /obj/item/analyzer, /obj/item/taperoll/engineering, - /obj/item/device/robotanalyzer, + /obj/item/robotanalyzer, /obj/item/material/minihoe, /obj/item/material/hatchet, - /obj/item/device/analyzer/plant_analyzer, + /obj/item/analyzer/plant_analyzer, /obj/item/extinguisher/mini, /obj/item/pipewrench, /obj/item/powerdrill, - /obj/item/device/radio, - /obj/item/device/debugger, - /obj/item/device/eftpos, + /obj/item/radio, + /obj/item/debugger, + /obj/item/eftpos, /obj/item/tape_roll, - /obj/item/device/geiger, + /obj/item/geiger, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialt, /obj/item/export_scanner, - /obj/item/device/price_scanner, - /obj/item/device/cratescanner, - /obj/item/device/destTagger, - /obj/item/device/quikpay + /obj/item/price_scanner, + /obj/item/cratescanner, + /obj/item/destTagger, + /obj/item/quikpay ) content_overlays = TRUE @@ -157,8 +157,8 @@ /obj/item/crowbar = 1, /obj/item/wirecutters/toolbelt = 1, /obj/item/stack/cable_coil/random = 1, - /obj/item/device/multitool = 1, - /obj/item/device/radio = 1 + /obj/item/multitool = 1, + /obj/item/radio = 1 ) @@ -169,7 +169,7 @@ /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, - /obj/item/device/t_scanner = 1 + /obj/item/t_scanner = 1 ) /obj/item/storage/belt/utility/alt @@ -183,8 +183,8 @@ icon_state = "medicalbelt" item_state = "medical" can_hold = list( - /obj/item/device/breath_analyzer, - /obj/item/device/healthanalyzer, + /obj/item/breath_analyzer, + /obj/item/healthanalyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, @@ -198,16 +198,16 @@ /obj/item/storage/box/fancy/cigarettes, /obj/item/storage/pill_bottle, /obj/item/stack/medical, - /obj/item/device/flashlight/pen, + /obj/item/flashlight/pen, /obj/item/clothing/mask/surgical, /obj/item/clothing/head/surgery, /obj/item/clothing/gloves/latex, /obj/item/reagent_containers/hypospray, /obj/item/clothing/glasses/hud/health, /obj/item/crowbar, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/extinguisher/mini, - /obj/item/device/radio, + /obj/item/radio, /obj/item/taperoll/medical, /obj/item/storage/box/fancy/med_pouch ) @@ -221,17 +221,17 @@ /obj/item/reagent_containers/glass/bottle/butazoline = 1, /obj/item/reagent_containers/glass/bottle/dermaline = 1, /obj/item/reagent_containers/glass/bottle/perconol = 1, - /obj/item/device/flashlight/pen = 1, + /obj/item/flashlight/pen = 1, /obj/item/storage/box/fancy/med_pouch/trauma = 1, ) /obj/item/storage/belt/medical/full/inaprov starts_with = list( - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 2, /obj/item/storage/pill_bottle/inaprovaline = 1, /obj/item/clothing/gloves/latex = 1, - /obj/item/device/flashlight/pen = 1, + /obj/item/flashlight/pen = 1, /obj/item/storage/box/fancy/med_pouch/trauma = 1, ) @@ -258,8 +258,8 @@ storage_slots = 9 max_storage_space = DEFAULT_BACKPACK_STORAGE can_hold = list( - /obj/item/device/breath_analyzer, - /obj/item/device/healthanalyzer, + /obj/item/breath_analyzer, + /obj/item/healthanalyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/glass/beaker, @@ -273,23 +273,23 @@ /obj/item/storage/box/fancy/cigarettes, /obj/item/storage/pill_bottle, /obj/item/stack/medical, - /obj/item/device/flashlight/pen, + /obj/item/flashlight/pen, /obj/item/clothing/mask/surgical, /obj/item/clothing/head/surgery, /obj/item/clothing/gloves/latex, /obj/item/reagent_containers/hypospray, /obj/item/clothing/glasses/hud/health, /obj/item/crowbar, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/extinguisher/mini, - /obj/item/device/radio, + /obj/item/radio, /obj/item/taperoll/medical, /obj/item/handcuffs, /obj/item/ammo_casing/shotgun, /obj/item/ammo_magazine, - /obj/item/device/flash, - /obj/item/device/flashlight/maglight, - /obj/item/device/flashlight/flare, + /obj/item/flash, + /obj/item/flashlight/maglight, + /obj/item/flashlight/flare, /obj/item/material/knife, /obj/item/stack/telecrystal, /obj/item/melee/baton, @@ -319,7 +319,7 @@ /obj/item/grenade, /obj/item/reagent_containers/spray/pepper, /obj/item/handcuffs, - /obj/item/device/flash, + /obj/item/flash, /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_magazine, @@ -328,12 +328,12 @@ /obj/item/gun/energy/taser, /obj/item/flame/lighter, /obj/item/clothing/glasses/hud/security, - /obj/item/device/flashlight/maglight, - /obj/item/device/flashlight/flare, + /obj/item/flashlight/maglight, + /obj/item/flashlight/flare, /obj/item/modular_computer/handheld, - /obj/item/device/radio/headset, - /obj/item/device/hailer, - /obj/item/device/megaphone, + /obj/item/radio/headset, + /obj/item/hailer, + /obj/item/megaphone, /obj/item/melee, /obj/item/crowbar, /obj/item/gun/projectile/sec, @@ -343,14 +343,14 @@ /obj/item/material/knife/trench, /obj/item/shield/energy, /obj/item/shield/riot/tact, - /obj/item/device/holowarrant, - /obj/item/device/taperecorder, - /obj/item/device/radio, - /obj/item/device/laser_pointer, - /obj/item/device/camera, + /obj/item/holowarrant, + /obj/item/taperecorder, + /obj/item/radio, + /obj/item/laser_pointer, + /obj/item/camera, /obj/item/clipboard, /obj/item/journal/notepad, - /obj/item/device/breath_analyzer + /obj/item/breath_analyzer ) content_overlays = TRUE @@ -359,8 +359,8 @@ /obj/item/melee/baton/loaded = 1, /obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, - /obj/item/device/flash = 1, - /obj/item/device/holowarrant = 1 + /obj/item/flash = 1, + /obj/item/holowarrant = 1 ) /obj/item/storage/belt/security/full/alt @@ -368,7 +368,7 @@ /obj/item/melee/baton/loaded = 1, /obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/gun/energy/taser = 1, ) @@ -377,9 +377,9 @@ /obj/item/melee/baton/loaded = 1, /obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/gun/energy/disruptorpistol = 1, - /obj/item/device/flashlight/flare = 1, + /obj/item/flashlight/flare = 1, ) /obj/item/storage/belt/security/full/pistol45 @@ -387,7 +387,7 @@ /obj/item/melee/baton/loaded = 1, /obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/gun/projectile/sec = 1, /obj/item/ammo_magazine/c45m/rubber = 2, ) @@ -395,9 +395,9 @@ /obj/item/storage/belt/security/full/investigator starts_with = list( /obj/item/taperoll/police = 1, - /obj/item/device/flash = 1, - /obj/item/device/camera/detective = 1, - /obj/item/device/taperecorder = 1 + /obj/item/flash = 1, + /obj/item/camera/detective = 1, + /obj/item/taperecorder = 1 ) /obj/item/storage/belt/security/vestbelt @@ -415,11 +415,11 @@ item_state = "soulstonebelt" storage_slots = 6 can_hold = list( - /obj/item/device/soulstone + /obj/item/soulstone ) /obj/item/storage/belt/soulstone/full - starts_with = list(/obj/item/device/soulstone = 6) + starts_with = list(/obj/item/soulstone = 6) /obj/item/storage/belt/champion name = "championship belt" @@ -451,14 +451,14 @@ can_hold = list( /obj/item/grenade, /obj/item/handcuffs, - /obj/item/device/flash, + /obj/item/flash, /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_magazine, /obj/item/melee/baton, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/modular_computer/handheld, - /obj/item/device/radio/headset, + /obj/item/radio/headset, /obj/item/melee, /obj/item/shield/energy, /obj/item/pinpointer, @@ -468,12 +468,12 @@ /obj/item/gun/energy/crossbow, /obj/item/material/knife/trench, /obj/item/ammo_casing/a145, - /obj/item/device/radio/uplink, + /obj/item/radio/uplink, /obj/item/card/emag, - /obj/item/device/multitool/hacktool, + /obj/item/multitool/hacktool, /obj/item/reagent_containers/hypospray/combat, /obj/item/stack/telecrystal, - /obj/item/device/radio, + /obj/item/radio, /obj/item/shield/riot/tact, /obj/item/material/knife/tacknife, /obj/item/cell/hydrogen @@ -497,19 +497,19 @@ /obj/item/crowbar, /obj/item/screwdriver, /obj/item/wrench, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/extinguisher/mini, - /obj/item/device/radio, + /obj/item/radio, /obj/item/clothing/gloves, /obj/item/clothing/glasses, /obj/item/reagent_containers/spray, /obj/item/grenade/chem_grenade, - /obj/item/device/lightreplacer, + /obj/item/lightreplacer, /obj/item/soap, /obj/item/storage/bag/trash, /obj/item/reagent_containers/glass/rag, /obj/item/gun/energy/mousegun, - /obj/item/device/gps, + /obj/item/gps, /obj/item/taperoll/custodial ) @@ -534,13 +534,13 @@ /obj/item/plastique/seismic, /obj/item/extraction_pack, /obj/item/ore_radar, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/stack/cable_coil, /obj/item/stack/flag, - /obj/item/device/wormhole_jaunter, - /obj/item/device/analyzer, + /obj/item/wormhole_jaunter, + /obj/item/analyzer, /obj/item/extinguisher/mini, - /obj/item/device/radio, + /obj/item/radio, /obj/item/clothing/gloves, /obj/item/clothing/glasses/material, /obj/item/pickaxe, @@ -551,7 +551,7 @@ /obj/item/reagent_containers/food/drinks/bottle, /obj/item/stack/medical, /obj/item/reagent_containers/hypospray, - /obj/item/device/gps, + /obj/item/gps, /obj/item/storage/bag/ore, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, @@ -562,9 +562,9 @@ /obj/item/extraction_pack, /obj/item/rfd/mining, /obj/item/gun/custom_ka, - /obj/item/device/orbital_dropper, + /obj/item/orbital_dropper, /obj/item/ore_detector, - /obj/item/device/spaceflare, + /obj/item/spaceflare, /obj/item/cell ) @@ -573,7 +573,7 @@ /obj/item/crowbar = 1, /obj/item/pickaxe = 1, /obj/item/shovel = 1, - /obj/item/device/analyzer = 1, + /obj/item/analyzer = 1, /obj/item/stack/flag/red = 1, /obj/item/ore_radar = 1, /obj/item/storage/bag/ore = 1, @@ -600,12 +600,12 @@ /obj/item/material/hatchet, /obj/item/wirecutters, /obj/item/reagent_containers/spray, //includes if you ever wish to get a spraybottle full of other chemicals, Like water - /obj/item/device/analyzer/plant_analyzer, + /obj/item/analyzer/plant_analyzer, /obj/item/clothing/gloves/botanic_leather, - /obj/item/device/radio, + /obj/item/radio, /obj/item/crowbar, - /obj/item/device/analyzer, - /obj/item/device/t_scanner, + /obj/item/analyzer, + /obj/item/t_scanner, ) /obj/item/storage/belt/hydro/full @@ -613,7 +613,7 @@ /obj/item/material/minihoe = 1, /obj/item/material/hatchet = 1, /obj/item/wirecutters/clippers = 1, - /obj/item/device/analyzer/plant_analyzer = 1, + /obj/item/analyzer/plant_analyzer = 1, /obj/item/storage/bag/plants = 1 ) @@ -630,15 +630,15 @@ can_hold = list( /obj/item/grenade, /obj/item/handcuffs, - /obj/item/device/flash, - /obj/item/device/paicard, + /obj/item/flash, + /obj/item/paicard, /obj/item/clothing/glasses, /obj/item/ammo_casing/shotgun, /obj/item/ammo_magazine, /obj/item/melee/baton, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/modular_computer/handheld, - /obj/item/device/radio/headset, + /obj/item/radio/headset, /obj/item/melee, /obj/item/crowbar, /obj/item/screwdriver, @@ -648,14 +648,14 @@ /obj/item/gun/projectile/pistol, /obj/item/gun/energy/crossbow, /obj/item/ammo_casing/a145, - /obj/item/device/radio/uplink, + /obj/item/radio/uplink, /obj/item/card/emag, - /obj/item/device/multitool/hacktool, + /obj/item/multitool/hacktool, /obj/item/reagent_containers, /obj/item/stack/telecrystal, /obj/item/material/sword, /obj/item/material/star, - /obj/item/device/radio + /obj/item/radio ) /obj/item/storage/belt/fannypack diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 62f64574384..03a4e9fa227 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -180,14 +180,14 @@ can_hold = list( /obj/item/clothing/mask, /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight/flare, + /obj/item/flashlight/flare, /obj/item/stack/medical, /obj/item/reagent_containers/hypospray/autoinjector, /obj/item/reagent_containers/inhaler, - /obj/item/device/oxycandle, + /obj/item/oxycandle, /obj/item/extinguisher/mini, - /obj/item/device/radio, - /obj/item/device/flashlight, + /obj/item/radio, + /obj/item/flashlight, /obj/item/reagent_containers/food/drinks/flask, /obj/item/storage/box/fancy/cigarettes, /obj/item/flame/lighter, @@ -198,8 +198,8 @@ starts_with = list( /obj/item/clothing/mask/breath = 1, /obj/item/tank/emergency_oxygen = 1, - /obj/item/device/oxycandle = 1, - /obj/item/device/flashlight/flare/glowstick/red = 1, + /obj/item/oxycandle = 1, + /obj/item/flashlight/flare/glowstick/red = 1, /obj/item/stack/medical/bruise_pack = 1, /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1 ) @@ -209,8 +209,8 @@ starts_with = list( /obj/item/clothing/mask/breath = 1, /obj/item/tank/emergency_oxygen/engi = 1, - /obj/item/device/oxycandle = 1, - /obj/item/device/flashlight/flare = 1, + /obj/item/oxycandle = 1, + /obj/item/flashlight/flare = 1, /obj/item/stack/medical/bruise_pack = 1, /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1 ) @@ -467,38 +467,38 @@ name = "box of firing pins" desc = "A box of NT brand Firearm authentication pins; Needed to operate most weapons." illustration = "firingpin" - starts_with = list(/obj/item/device/firing_pin = 7) + starts_with = list(/obj/item/firing_pin = 7) /obj/item/storage/box/securitypins name = "box of wireless-control firing pins" desc = "A box of NT brand Firearm authentication pins; Needed to operate most weapons. These firing pins are wireless-control enabled." illustration = "firingpin" - starts_with = list(/obj/item/device/firing_pin/wireless = 7) + starts_with = list(/obj/item/firing_pin/wireless = 7) /obj/item/storage/box/testpins name = "box of firing pins" desc = "A box of NT brand Testing Authentication pins; allows guns to fire in designated firing ranges." illustration = "firingpin" - starts_with = list(/obj/item/device/firing_pin/test_range = 7) + starts_with = list(/obj/item/firing_pin/test_range = 7) /obj/item/storage/box/loyaltypins name = "box of firing pins" desc = "A box of specialised \"loyalty\" authentication pins produced by NanoTrasen; these check to see if the user of the gun it's installed in has been implanted with a mind shield implant. Often used in ERTs." illustration = "firingpin" - starts_with = list(/obj/item/device/firing_pin/implant/loyalty = 7) + starts_with = list(/obj/item/firing_pin/implant/loyalty = 7) /obj/item/storage/box/loyaltypins/fill() ..() - new /obj/item/device/firing_pin/implant/loyalty(src) - new /obj/item/device/firing_pin/implant/loyalty(src) - new /obj/item/device/firing_pin/implant/loyalty(src) - new /obj/item/device/firing_pin/implant/loyalty(src) + new /obj/item/firing_pin/implant/loyalty(src) + new /obj/item/firing_pin/implant/loyalty(src) + new /obj/item/firing_pin/implant/loyalty(src) + new /obj/item/firing_pin/implant/loyalty(src) /obj/item/storage/box/firingpinsRD name = "box of assorted firing pins" desc = "A box of varied assortment of firing pins. Appears to have R&D stickers on all sides of the box. Also seems to have a smiley face sticker on the top of it." illustration = "firingpin" - starts_with = list(/obj/item/device/firing_pin = 2, /obj/item/device/firing_pin/access = 2, /obj/item/device/firing_pin/implant/loyalty = 2, /obj/item/device/firing_pin/psionic = 1, /obj/item/device/firing_pin/dna = 1) + starts_with = list(/obj/item/firing_pin = 2, /obj/item/firing_pin/access = 2, /obj/item/firing_pin/implant/loyalty = 2, /obj/item/firing_pin/psionic = 1, /obj/item/firing_pin/dna = 1) /obj/item/storage/box/psireceiver name = "box of psionic receivers" @@ -698,7 +698,7 @@ name = "box of Pest-B-Gon mousetraps" desc = "WARNING: Keep out of reach of children." illustration = "mousetraps" - starts_with = list(/obj/item/device/assembly/mousetrap = 6) + starts_with = list(/obj/item/assembly/mousetrap = 6) /obj/item/storage/box/pillbottles name = "box of pill bottles" @@ -1029,19 +1029,19 @@ name = "hadiist manifesto box" desc = "A box filled with copies of the Hadiist Manifesto" illustration = "paper" - starts_with = list(/obj/item/device/versebook/pra = 6) + starts_with = list(/obj/item/versebook/pra = 6) /obj/item/storage/box/dpra_manifesto name = "al'mariist manifesto box" desc = "A box filled with copies of 'In Defense of Al'mari's Legacy'." illustration = "paper" - starts_with = list(/obj/item/device/versebook/dpra = 6) + starts_with = list(/obj/item/versebook/dpra = 6) /obj/item/storage/box/nka_manifesto name = "royalist manifesto card box" desc = "A box filled with copies of 'The New Kingdom'." illustration = "paper" - starts_with = list(/obj/item/device/versebook/nka = 6) + starts_with = list(/obj/item/versebook/nka = 6) /obj/item/storage/box/suns_flags name = "s'rand'marr Worship flag box" @@ -1358,7 +1358,7 @@ /obj/item/storage/box/encryption_key name = "box" illustration = "circuit" - starts_with = list(/obj/item/device/encryptionkey/rev = 8) + starts_with = list(/obj/item/encryptionkey/rev = 8) /obj/item/storage/box/encryption_key/antagonist_hints(mob/user, distance, is_adjacent) . += ..() @@ -1483,10 +1483,10 @@ foldable = FALSE max_storage_space = DEFAULT_BOX_STORAGE can_hold = list( - /obj/item/device/flashlight/flare + /obj/item/flashlight/flare ) starts_with = list( - /obj/item/device/flashlight/flare = 12 + /obj/item/flashlight/flare = 12 ) // Magnetic Locks @@ -1498,10 +1498,10 @@ foldable = FALSE max_storage_space = DEFAULT_BOX_STORAGE can_hold = list( - /obj/item/device/magnetic_lock + /obj/item/magnetic_lock ) starts_with = list( - /obj/item/device/magnetic_lock = 4 + /obj/item/magnetic_lock = 4 ) // Power Cells @@ -1583,7 +1583,7 @@ desc = "A box containing 5 claymore landmines, relative detonators, and a spare one to trigger them all." starts_with = list( /obj/item/landmine/claymore = 5, - /obj/item/device/assembly/signaler = 6 + /obj/item/assembly/signaler = 6 ) /obj/item/storage/box/unique/tea diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 37de9a51c6d..2e0bf950a2d 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -40,7 +40,7 @@ /obj/item/storage/pill_bottle/inaprovaline = 1, /obj/item/storage/pill_bottle/perconol = 1, /obj/item/stack/medical/splint = 2, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/fire @@ -61,7 +61,7 @@ /obj/item/stack/medical/advanced/ointment = 4, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 4, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/toxin @@ -81,7 +81,7 @@ starts_with = list( /obj/item/storage/box/fancy/med_pouch/toxin = 8, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem = 2, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/o2 @@ -114,7 +114,7 @@ /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 2, /obj/item/stack/medical/splint = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/large/adv @@ -127,7 +127,7 @@ /obj/item/stack/medical/advanced/bruise_pack = 5, /obj/item/stack/medical/advanced/ointment = 4, /obj/item/stack/medical/splint = 2, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/combat @@ -143,7 +143,7 @@ /obj/item/storage/pill_bottle/mortaphenyl = 1, /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1, /obj/item/stack/medical/splint = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/large/combat @@ -160,7 +160,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/fluvectionem = 1, /obj/item/stack/medical/splint = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/surgery @@ -208,7 +208,7 @@ /obj/item/stack/medical/advanced/bruise_pack = 4, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/butazoline = 4, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 4, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/radiation @@ -229,7 +229,7 @@ /obj/item/storage/box/fancy/med_pouch/radiation = 6, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dermaline = 1, /obj/item/stack/medical/ointment = 2, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/stab // Generic first aid kit for mappers that covers all bases. @@ -243,7 +243,7 @@ /obj/item/storage/box/fancy/med_pouch/oxyloss = 1, /obj/item/storage/box/fancy/med_pouch/toxin = 1, /obj/item/storage/box/fancy/med_pouch/radiation = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/large/stab // Generic first aid kit for mappers that covers all bases. @@ -257,7 +257,7 @@ /obj/item/storage/box/fancy/med_pouch/oxyloss = 2, /obj/item/storage/box/fancy/med_pouch/toxin = 2, /obj/item/storage/box/fancy/med_pouch/radiation = 2, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) /obj/item/storage/firstaid/sleekstab @@ -274,7 +274,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/inaprovaline = 2, /obj/item/reagent_containers/hypospray/autoinjector/oxygen = 1, /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, - /obj/item/device/healthanalyzer = 1 + /obj/item/healthanalyzer = 1 ) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 83818e8eda9..a37a33a9383 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -537,12 +537,12 @@ if(LAZYLEN(can_hold)) var/can_hold_item = can_hold_strict ? (item_to_check.type in can_hold) : is_type_in_list(item_to_check, can_hold) if(!can_hold_item) - if(!stop_messages && ! istype(item_to_check, /obj/item/device/hand_labeler)) + if(!stop_messages && ! istype(item_to_check, /obj/item/hand_labeler)) to_chat(usr, SPAN_NOTICE("\The [src] cannot hold \the [item_to_check].")) return FALSE var/max_instances = can_hold[item_to_check.type] if(max_instances && instances_of_type_in_list(item_to_check, contents, TRUE) >= max_instances) - if(!stop_messages && !istype(item_to_check, /obj/item/device/hand_labeler)) + if(!stop_messages && !istype(item_to_check, /obj/item/hand_labeler)) to_chat(usr, SPAN_NOTICE("\The [src] has no more space specifically for \the [item_to_check].")) return FALSE @@ -733,8 +733,8 @@ to_chat(user, SPAN_WARNING("Trying to place a loaded tray into [src] was a bad idea.")) return - if(istype(attacking_item, /obj/item/device/hand_labeler)) - var/obj/item/device/hand_labeler/HL = attacking_item + if(istype(attacking_item, /obj/item/hand_labeler)) + var/obj/item/hand_labeler/HL = attacking_item if(HL.mode == 1) return diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index f2f333a2057..973990df582 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -31,15 +31,15 @@ starts_with = list( /obj/item/crowbar/red = 1, /obj/item/extinguisher/mini = 1, - /obj/item/device/radio = 1 + /obj/item/radio = 1 ) /obj/item/storage/toolbox/emergency/fill() . = ..() if(prob(50)) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) else - new /obj/item/device/flashlight/flare/glowstick/red(src) + new /obj/item/flashlight/flare/glowstick/red(src) if(prob(30)) new /obj/item/weldingtool/emergency(src) new /obj/item/clothing/glasses/welding/emergency(src) @@ -53,7 +53,7 @@ /obj/item/wrench = 1,\ /obj/item/weldingtool = 1, /obj/item/crowbar = 1,\ - /obj/item/device/analyzer = 1,\ + /obj/item/analyzer = 1,\ /obj/item/wirecutters = 1\ ) @@ -64,7 +64,7 @@ starts_with = list(\ /obj/item/screwdriver = 1,\ /obj/item/wirecutters = 1,\ - /obj/item/device/t_scanner = 1,\ + /obj/item/t_scanner = 1,\ /obj/item/crowbar = 1\ ) @@ -90,7 +90,7 @@ /obj/item/wrench = 1, /obj/item/mining_scanner = 1, /obj/item/cell/high = 1, - /obj/item/device/orbital_dropper/drill = 1 + /obj/item/orbital_dropper/drill = 1 ) /obj/item/storage/toolbox/ka @@ -118,7 +118,7 @@ /obj/item/weldingtool = 1, /obj/item/crowbar = 1,\ /obj/item/wirecutters = 1,\ - /obj/item/device/multitool = 1,\ + /obj/item/multitool = 1,\ ) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index e710aef7c80..13c6092b8ab 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -83,9 +83,9 @@ starts_with = list( /obj/item/stamp/chameleon = 1, /obj/item/pen/chameleon = 1, - /obj/item/device/destTagger = 1, + /obj/item/destTagger = 1, /obj/item/stack/packageWrap = 1, - /obj/item/device/hand_labeler = 1, + /obj/item/hand_labeler = 1, /obj/item/folder/filled = 1 ) @@ -109,7 +109,7 @@ /obj/item/storage/box/syndie_kit/spy name = "spy kit" desc = "For when you want to conduct voyeurism from afar." - starts_with = list(/obj/item/device/spy_bug = 6, /obj/item/device/spy_monitor = 1) + starts_with = list(/obj/item/spy_bug = 6, /obj/item/spy_monitor = 1) /obj/item/storage/box/syndie_kit/spy/hidden name = "box" @@ -228,7 +228,7 @@ /obj/item/storage/box/syndie_kit/radsuit name = "radiation suit kit" desc = "Contains a radiation suit and geiger counter to protect you from radiation." - starts_with = list(/obj/item/clothing/head/radiation = 1, /obj/item/clothing/suit/radiation = 1, /obj/item/clothing/glasses/safety/goggles = 1, /obj/item/device/geiger = 1, /obj/item/reagent_containers/pill/hyronalin = 1) + starts_with = list(/obj/item/clothing/head/radiation = 1, /obj/item/clothing/suit/radiation = 1, /obj/item/clothing/glasses/safety/goggles = 1, /obj/item/geiger = 1, /obj/item/reagent_containers/pill/hyronalin = 1) /obj/item/storage/box/syndie_kit/syringe_gun name = "syringe gun kit" diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 5109b6297cf..d7adde0a145 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -16,7 +16,7 @@ /obj/item/clothing/accessory/badge, /obj/item/clothing/accessory/locket, /obj/item/clothing/ring, - /obj/item/device/flashlight/pen, + /obj/item/flashlight/pen, /obj/item/seeds, /obj/item/coin, /obj/item/stack/dice, @@ -32,8 +32,8 @@ /obj/item/photo, /obj/item/reagent_containers/pill, /obj/item/stamp, - /obj/item/device/paicard, - /obj/item/device/encryptionkey, + /obj/item/paicard, + /obj/item/encryptionkey, /obj/item/fluff, /obj/item/storage/business_card_holder, /obj/item/sample, diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index f351b93bb30..e8039b116c2 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -253,7 +253,7 @@ /obj/item/surgery/fix_o_vein = "tray_fixovein", /obj/item/stack/medical/advanced/bruise_pack = "tray_bruise_pack", /obj/item/autopsy_scanner = "tray_autopsy_scanner", - /obj/item/device/mass_spectrometer = "tray_mass_spectrometer", + /obj/item/mass_spectrometer = "tray_mass_spectrometer", /obj/item/reagent_containers/glass/beaker/vial = "tray_vial", /obj/item/reagent_containers/syringe = "tray_syringe" ) @@ -313,7 +313,7 @@ /obj/item/surgery/surgicaldrill = 1, /obj/item/surgery/cautery = 1, /obj/item/autopsy_scanner = 1, - /obj/item/device/mass_spectrometer = 1, + /obj/item/mass_spectrometer = 1, /obj/item/reagent_containers/glass/beaker/vial = 1, /obj/item/reagent_containers/syringe = 1 ) @@ -326,7 +326,7 @@ /obj/item/surgery/surgicaldrill, /obj/item/surgery/cautery, /obj/item/autopsy_scanner, - /obj/item/device/mass_spectrometer, + /obj/item/mass_spectrometer, /obj/item/reagent_containers/glass/beaker/vial, /obj/item/reagent_containers/syringe ) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 422996ede47..23430050db5 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -59,16 +59,16 @@ STOP_PROCESSING(SSprocessing, src) - if(istype(loc, /obj/item/device/transfer_valve)) - var/obj/item/device/transfer_valve/TTV = loc + if(istype(loc, /obj/item/transfer_valve)) + var/obj/item/transfer_valve/TTV = loc TTV.remove_tank(src) return ..() /obj/item/tank/attackby(obj/item/attacking_item, mob/user) ..() - if ((istype(attacking_item, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) - var/obj/item/device/analyzer/A = attacking_item + if ((istype(attacking_item, /obj/item/analyzer)) && get_dist(user, src) <= 1) + var/obj/item/analyzer/A = attacking_item A.analyze_gases(src, user) if (istype(attacking_item, /obj/item/toy/balloon)) @@ -76,7 +76,7 @@ B.blow(src) src.add_fingerprint(user) - if(istype(attacking_item, /obj/item/device/assembly_holder)) + if(istype(attacking_item, /obj/item/assembly_holder)) bomb_assemble(attacking_item, user) /obj/item/tank/attack_self(mob/user as mob) @@ -93,7 +93,7 @@ /obj/item/tank/ui_host(mob/user) . = ..() - if(istype(loc,/obj/item/device/transfer_valve)) + if(istype(loc,/obj/item/transfer_valve)) return loc /obj/item/tank/ui_data(mob/user) @@ -242,7 +242,7 @@ var/pressure = air_contents.return_pressure() if(pressure > TANK_FRAGMENT_PRESSURE) - if(!istype(src.loc,/obj/item/device/transfer_valve)) + if(!istype(src.loc,/obj/item/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index ae42179bce7..fad2ee710fc 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -76,7 +76,7 @@ Frequency: if (sr) src.temp += "Located Beacons:
" - for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons) + for(var/obj/item/radio/beacon/W in GLOB.teleportbeacons) if (W.get_frequency() == src.frequency) var/turf/tr = get_turf(W) if (tr.z == sr.z && tr) diff --git a/code/game/objects/items/weapons/tether.dm b/code/game/objects/items/weapons/tether.dm index 8d05d375b77..e5ce2aec731 100644 --- a/code/game/objects/items/weapons/tether.dm +++ b/code/game/objects/items/weapons/tether.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_INIT_TYPED(all_tethers, /obj/item/tethering_device, list()) /obj/item/tethering_device name = "tethering device" desc = "A device used by explorers to keep track of partners by way of electro-tether." - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps" item_state = "radio" contained_sprite = TRUE diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm index 8e8c69ac46f..95614cbfd74 100644 --- a/code/game/objects/random/loot.dm +++ b/code/game/objects/random/loot.dm @@ -56,26 +56,26 @@ /obj/item/clothing/under/syndicate/tracksuit = 0.2, /obj/item/clothing/under/skrell/wetsuit/swimstars = 0.1, // WE LOVE SWIMSTARS! /obj/item/clothing/under/skrell/wetsuit/swimstars/alt = 0.1, - /obj/item/device/firing_pin = 0.3, - /obj/item/device/firing_pin/clown = 0.01, - /obj/item/device/flashlight = 1, - /obj/item/device/flashlight/flare = 0.5, - /obj/item/device/flashlight/heavy = 0.5, - /obj/item/device/flashlight/lantern = 0.4, - /obj/item/device/flashlight/maglight = 0.4, - /obj/item/device/paint_sprayer = 0.6, - /obj/item/device/gps/engineering = 0.6, - /obj/item/device/kinetic_analyzer = 0.1, - /obj/item/device/laser_pointer/purple = 0.1, - /obj/item/device/light_meter = 0.1, - /obj/item/device/magnetic_lock/engineering = 0.3, - /obj/item/device/magnetic_lock/keypad = 0.1, - /obj/item/device/magnetic_lock/security = 0.3, - /obj/item/device/megaphone = 0.3, - /obj/item/device/price_scanner = 0.1, - /obj/item/device/taperecorder = 0.6, - /obj/item/device/uv_light = 0.1, - /obj/item/device/wormhole_jaunter = 0.1, + /obj/item/firing_pin = 0.3, + /obj/item/firing_pin/clown = 0.01, + /obj/item/flashlight = 1, + /obj/item/flashlight/flare = 0.5, + /obj/item/flashlight/heavy = 0.5, + /obj/item/flashlight/lantern = 0.4, + /obj/item/flashlight/maglight = 0.4, + /obj/item/paint_sprayer = 0.6, + /obj/item/gps/engineering = 0.6, + /obj/item/kinetic_analyzer = 0.1, + /obj/item/laser_pointer/purple = 0.1, + /obj/item/light_meter = 0.1, + /obj/item/magnetic_lock/engineering = 0.3, + /obj/item/magnetic_lock/keypad = 0.1, + /obj/item/magnetic_lock/security = 0.3, + /obj/item/megaphone = 0.3, + /obj/item/price_scanner = 0.1, + /obj/item/taperecorder = 0.6, + /obj/item/uv_light = 0.1, + /obj/item/wormhole_jaunter = 0.1, /obj/item/inflatable/door/ = 0.1, /obj/item/seeds/random = 0.25, /obj/item/stack/material/bronze{amount=10}, @@ -162,9 +162,9 @@ /obj/random_produce = 0.25, /obj/random/watches = 1, /obj/random/wizard_dressup = 0.25, - /obj/item/device/synthesized_instrument/violin = 0.1, - /obj/item/device/synthesized_instrument/guitar = 1, - /obj/item/device/synthesized_instrument/trumpet = 0.25, + /obj/item/synthesized_instrument/violin = 0.1, + /obj/item/synthesized_instrument/guitar = 1, + /obj/item/synthesized_instrument/trumpet = 0.25, /obj/item/reagent_containers/pill/cleaner_tablet = 0.6, /obj/item/storage/box/fancy/food/pralinebox = 0.1 ) @@ -179,7 +179,7 @@ /obj/random/melee = 0.3, /obj/item/gun/energy/lawgiver = 0.1, /obj/item/gun/projectile/automatic/terminator = 0.1, - /obj/item/device/personal_shield = 0.4, + /obj/item/personal_shield = 0.4, /obj/random/safe_rig = 0.4, /obj/item/gun/energy/disruptorpistol/magnum = 0.3, /obj/item/gun/projectile/shotgun/pump/combat = 0.2, @@ -218,7 +218,7 @@ /obj/item/rfd/construction = 0.4, /obj/item/vaurca/box = 0.1, /obj/item/melee/vaurca/rock = 0.1, - /obj/item/device/personal_shield = 0.1, + /obj/item/personal_shield = 0.1, /obj/item/storage/secure/briefcase/money = 0.1 ) @@ -233,7 +233,7 @@ desc = "This is a random corporate safe high value item." icon_state = "coin" problist = list( - /obj/item/device/personal_shield = 0.4, + /obj/item/personal_shield = 0.4, /obj/random/safe_rig = 0.4, /obj/item/clothing/glasses/thermal = 0.3, /obj/item/storage/toolbox/infiltration = 0.3, @@ -514,14 +514,14 @@ name = "random light" icon_state = "flashlight" problist = list( - /obj/item/device/flashlight = 1, - /obj/item/device/flashlight/flare = 2, - /obj/item/device/flashlight/lamp = 0.5, - /obj/item/device/flashlight/maglight = 0.25, - /obj/item/device/flashlight/marshallingwand = 0.25, - /obj/item/device/flashlight/pen = 1, - /obj/item/device/flashlight/heavy = 0.05, - /obj/item/device/flashlight/lamp = 0.25 + /obj/item/flashlight = 1, + /obj/item/flashlight/flare = 2, + /obj/item/flashlight/lamp = 0.5, + /obj/item/flashlight/maglight = 0.25, + /obj/item/flashlight/marshallingwand = 0.25, + /obj/item/flashlight/pen = 1, + /obj/item/flashlight/heavy = 0.05, + /obj/item/flashlight/lamp = 0.25 ) /obj/random/med_stack diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index bd3aeed9ddd..c644372e766 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -159,15 +159,15 @@ desc = "This is a random lava lamp." icon_state = "lavalamp" spawnlist = list( - /obj/item/device/flashlight/lamp/lava, - /obj/item/device/flashlight/lamp/lava/red, - /obj/item/device/flashlight/lamp/lava/orange, - /obj/item/device/flashlight/lamp/lava/yellow, - /obj/item/device/flashlight/lamp/lava/green, - /obj/item/device/flashlight/lamp/lava/cyan, - /obj/item/device/flashlight/lamp/lava/blue, - /obj/item/device/flashlight/lamp/lava/purple, - /obj/item/device/flashlight/lamp/lava/pink + /obj/item/flashlight/lamp/lava, + /obj/item/flashlight/lamp/lava/red, + /obj/item/flashlight/lamp/lava/orange, + /obj/item/flashlight/lamp/lava/yellow, + /obj/item/flashlight/lamp/lava/green, + /obj/item/flashlight/lamp/lava/cyan, + /obj/item/flashlight/lamp/lava/blue, + /obj/item/flashlight/lamp/lava/purple, + /obj/item/flashlight/lamp/lava/pink ) /obj/random/glowstick @@ -175,11 +175,11 @@ desc = "This is a random glowstick." icon_state = "glowstick" spawnlist = list( - /obj/item/device/flashlight/flare/glowstick, - /obj/item/device/flashlight/flare/glowstick/red, - /obj/item/device/flashlight/flare/glowstick/blue, - /obj/item/device/flashlight/flare/glowstick/orange, - /obj/item/device/flashlight/flare/glowstick/yellow + /obj/item/flashlight/flare/glowstick, + /obj/item/flashlight/flare/glowstick/red, + /obj/item/flashlight/flare/glowstick/blue, + /obj/item/flashlight/flare/glowstick/orange, + /obj/item/flashlight/flare/glowstick/yellow ) /obj/random/arcade @@ -220,13 +220,13 @@ /obj/item/clothing/mask/gas/mime = 11, /obj/item/clothing/shoes/slippers/carp = 9, /obj/item/gun/energy/wand/toy = 5, - /obj/item/device/binoculars = 11, - /obj/item/device/megaphone = 11, + /obj/item/binoculars = 11, + /obj/item/megaphone = 11, /obj/item/eightball = 11, /obj/item/eightball/haunted = 1, /obj/item/eightball/broken = 1, /obj/item/spirit_board = 5, - /obj/item/device/laser_pointer = 1, + /obj/item/laser_pointer = 1, /obj/item/clothing/accessory/badge/press/plastic = 2, /obj/item/storage/box/partypopper = 11 ) @@ -250,8 +250,8 @@ /obj/item/pen/invisible = 10, /obj/item/grenade/fake = 7, /obj/item/gun/energy/wand/toy = 7, - /obj/item/device/binoculars = 11, - /obj/item/device/megaphone = 11, + /obj/item/binoculars = 11, + /obj/item/megaphone = 11, /obj/item/eightball = 11, /obj/item/eightball/haunted = 5, /obj/item/spirit_board = 5, @@ -381,7 +381,7 @@ /obj/item/lipstick/random = 0.25, /obj/item/reagent_containers/glass/beaker/vial/random = 0.1, /obj/item/towel/random = 0.1, - /obj/item/device/flashlight/flare/glowstick/random = 0.25, + /obj/item/flashlight/flare/glowstick/random = 0.25, /obj/item/stack/cable_coil/random/ = 0.1, /obj/item/bananapeel = 0.1, //honk, /obj/item/key = 0.1, diff --git a/code/game/objects/random/tech.dm b/code/game/objects/random/tech.dm index 66e49a72b28..cc9abbfa91c 100644 --- a/code/game/objects/random/tech.dm +++ b/code/game/objects/random/tech.dm @@ -9,18 +9,18 @@ /obj/item/crowbar, /obj/item/wrench, /obj/item/hammer, - /obj/item/device/flashlight + /obj/item/flashlight ) /obj/random/technology_scanner name = "random scanner" desc = "This is a random technology scanner." - icon = 'icons/obj/item/device/air_analyzer.dmi' + icon = 'icons/obj/item/air_analyzer.dmi' icon_state = "analyzer" problist = list( - /obj/item/device/t_scanner = 5, - /obj/item/device/radio = 2, - /obj/item/device/analyzer = 5 + /obj/item/t_scanner = 5, + /obj/item/radio = 2, + /obj/item/analyzer = 5 ) /obj/random/powercell @@ -43,11 +43,11 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "signaller" problist = list( - /obj/item/device/assembly/igniter = 2, - /obj/item/device/assembly/prox_sensor = 2, - /obj/item/device/assembly/signaler = 2, - /obj/item/device/multitool = 1, - /obj/item/device/transfer_valve = 0.5 + /obj/item/assembly/igniter = 2, + /obj/item/assembly/prox_sensor = 2, + /obj/item/assembly/signaler = 2, + /obj/item/multitool = 1, + /obj/item/transfer_valve = 0.5 ) /obj/random/toolbox diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index 7cb636265d5..917c26fbf38 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -75,14 +75,14 @@ GLOBAL_LIST_EMPTY(total_active_bonfires) if(fuel >= max(max_fuel * 0.1, 50) && on_fire) to_chat(H, SPAN_NOTICE("You grab a burning stick from the fire.")) fuel -= 40 - var/obj/item/device/flashlight/flare/torch/stick/torch = new(get_turf(user)) + var/obj/item/flashlight/flare/torch/stick/torch = new(get_turf(user)) H.put_in_active_hand(torch) /obj/structure/bonfire/attackby(obj/item/attacking_item, mob/user) if(attacking_item.isFlameSource() && !on_fire) // needs to go last or else nothing else will work light(user) return - if(on_fire && (istype(attacking_item, /obj/item/flame) || istype(attacking_item, /obj/item/device/flashlight/flare/torch) || istype(attacking_item, /obj/item/clothing/mask/smokable))) //light unlit stuff + if(on_fire && (istype(attacking_item, /obj/item/flame) || istype(attacking_item, /obj/item/flashlight/flare/torch) || istype(attacking_item, /obj/item/clothing/mask/smokable))) //light unlit stuff attacking_item.attackby(src, user) return if(fuel < max_fuel) diff --git a/code/game/objects/structures/carts/engicart.dm b/code/game/objects/structures/carts/engicart.dm index 5be7fe21e38..45091b85eab 100644 --- a/code/game/objects/structures/carts/engicart.dm +++ b/code/game/objects/structures/carts/engicart.dm @@ -7,7 +7,7 @@ var/list/my_glass = list() var/list/my_metal = list() var/list/my_plasteel = list() - var/obj/item/device/lightreplacer/my_lightreplacer = null + var/obj/item/lightreplacer/my_lightreplacer = null var/obj/item/storage/toolbox/mechanical/my_blue_toolbox = null var/obj/item/storage/toolbox/electrical/my_yellow_toolbox = null var/obj/item/storage/toolbox/emergency/my_red_toolbox = null @@ -18,7 +18,7 @@ /obj/item/stack/material/glass, /obj/item/stack/material/steel, /obj/item/stack/material/plasteel, - /obj/item/device/lightreplacer, + /obj/item/lightreplacer, /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/emergency @@ -134,7 +134,7 @@ else storage_is_full = TRUE - if(istype(attacking_item, /obj/item/device/lightreplacer)) //---- light replacer + if(istype(attacking_item, /obj/item/lightreplacer)) //---- light replacer if(!my_lightreplacer) my_lightreplacer = attacking_item should_store = TRUE @@ -239,7 +239,7 @@ user.put_in_hands(chosen_item) to_chat(user, SPAN_NOTICE("You take [my_plasteel[chosen_item]] from [src].")) my_plasteel -= chosen_item - if(/obj/item/device/lightreplacer, /obj/item/device/lightreplacer/advanced) + if(/obj/item/lightreplacer, /obj/item/lightreplacer/advanced) if(my_lightreplacer) user.put_in_hands(my_lightreplacer) to_chat(user, SPAN_NOTICE("You take [my_lightreplacer] from [src].")) @@ -302,7 +302,7 @@ /obj/structure/cart/storage/engineeringcart/full/Initialize() . = ..() - my_lightreplacer = new /obj/item/device/lightreplacer(src) + my_lightreplacer = new /obj/item/lightreplacer(src) my_blue_toolbox = new /obj/item/storage/toolbox/mechanical(src) my_yellow_toolbox = new /obj/item/storage/toolbox/electrical(src) my_red_toolbox = new /obj/item/storage/toolbox/emergency(src) diff --git a/code/game/objects/structures/carts/janicart.dm b/code/game/objects/structures/carts/janicart.dm index 9794e0b4097..c34e5c8a5ac 100644 --- a/code/game/objects/structures/carts/janicart.dm +++ b/code/game/objects/structures/carts/janicart.dm @@ -7,7 +7,7 @@ var/obj/item/storage/bag/trash/my_bag = null var/obj/item/mop/my_mop = null var/obj/item/reagent_containers/spray/my_spray = null - var/obj/item/device/lightreplacer/my_lightreplacer = null + var/obj/item/lightreplacer/my_lightreplacer = null var/obj/structure/mopbucket/my_bucket = null var/signs = 0 var/max_signs = 4 @@ -16,7 +16,7 @@ /obj/item/storage/bag/trash, /obj/item/mop, /obj/item/reagent_containers/spray, - /obj/item/device/lightreplacer, + /obj/item/lightreplacer, /obj/item/clothing/suit/caution )) @@ -54,7 +54,7 @@ my_bag = new /obj/item/storage/bag/trash(src) my_mop = new /obj/item/mop(src) my_spray = new /obj/item/reagent_containers/spray/cleaner(src) - my_lightreplacer = new /obj/item/device/lightreplacer(src) + my_lightreplacer = new /obj/item/lightreplacer(src) for(signs, signs < max_signs, signs++) new /obj/item/clothing/suit/caution(src) @@ -144,8 +144,8 @@ held_container.afterattack(my_bucket, user, 1) /// If its an advanced light replacer, try to dump the broken lights in the trash. - else if(istype(held_item, /obj/item/device/lightreplacer)) - var/obj/item/device/lightreplacer/held_lightreplacer = held_item + else if(istype(held_item, /obj/item/lightreplacer)) + var/obj/item/lightreplacer/held_lightreplacer = held_item if(held_lightreplacer.store_broken) return my_bag.attackby(held_item, user) @@ -171,7 +171,7 @@ var/should_store = FALSE var/storage_is_full = FALSE - if(istype(attacking_item, /obj/item/device/lightreplacer)) //---- light replacer + if(istype(attacking_item, /obj/item/lightreplacer)) //---- light replacer if(!my_lightreplacer) my_lightreplacer = attacking_item should_store = TRUE @@ -238,7 +238,7 @@ user.put_in_hands(my_spray) to_chat(user, SPAN_NOTICE("You take [my_spray] from [src].")) my_spray = null - if(istype(chosen_item, /obj/item/device/lightreplacer) && my_lightreplacer) + if(istype(chosen_item, /obj/item/lightreplacer) && my_lightreplacer) user.put_in_hands(my_lightreplacer) to_chat(user, SPAN_NOTICE("You take [my_lightreplacer] from [src].")) my_lightreplacer = null @@ -322,7 +322,7 @@ AddOverlays("cart_spray") has_items = TRUE if(my_lightreplacer) - if(istype(my_lightreplacer, /obj/item/device/lightreplacer/advanced)) + if(istype(my_lightreplacer, /obj/item/lightreplacer/advanced)) AddOverlays("cart_adv_replacer") else AddOverlays("cart_replacer") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 411ca11e8d7..6a0a8696b69 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -414,8 +414,8 @@ user.drop_from_inventory(attacking_item,loc) else user.drop_item() - else if(istype(attacking_item, /obj/item/device/cratescanner)) - var/obj/item/device/cratescanner/Cscanner = attacking_item + else if(istype(attacking_item, /obj/item/cratescanner)) + var/obj/item/cratescanner/Cscanner = attacking_item if(locked) to_chat(user, SPAN_WARNING("[attacking_item] refuses to scan \the [src]. Unlock it first!")) return @@ -484,8 +484,8 @@ attacking_item.play_tool_sound(get_turf(src), 50) wrenched = TRUE anchored = TRUE - else if(istype(attacking_item, /obj/item/device/hand_labeler)) - var/obj/item/device/hand_labeler/HL = attacking_item + else if(istype(attacking_item, /obj/item/hand_labeler)) + var/obj/item/hand_labeler/HL = attacking_item if(HL.mode == 1) return else @@ -840,17 +840,17 @@ Contents Scanner ========================== */ -/obj/item/device/cratescanner +/obj/item/cratescanner name = "crate contents scanner" desc = "A handheld device used to scan and print a manifest of a container's contents. Does not work on locked crates, for privacy reasons." - icon = 'icons/obj/item/device/cratescanner.dmi' + icon = 'icons/obj/item/cratescanner.dmi' icon_state = "cratescanner" matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140) w_class = WEIGHT_CLASS_SMALL obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT -/obj/item/device/cratescanner/proc/print_contents(targetname, targetcontents, targetloc) +/obj/item/cratescanner/proc/print_contents(targetname, targetcontents, targetloc) var/output = list() var/list/outputstring for(var/atom/item in targetcontents) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index e62931f84d0..4b57e1830df 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -16,8 +16,8 @@ /obj/structure/closet/gmcloset/fill() new /obj/item/clothing/head/that(src) new /obj/item/clothing/head/that(src) - new /obj/item/device/radio/headset/headset_service(src) - new /obj/item/device/radio/headset/headset_service(src) + new /obj/item/radio/headset/headset_service(src) + new /obj/item/radio/headset/headset_service(src) new /obj/item/clothing/head/pin/flower(src) new /obj/item/clothing/head/pin/flower/pink(src) new /obj/item/clothing/head/pin/flower/yellow(src) @@ -45,8 +45,8 @@ new /obj/item/clothing/under/waiter(src) if(prob(1)) new /obj/item/gun/energy/mousegun(src) - new /obj/item/device/radio/headset/headset_service(src) - new /obj/item/device/radio/headset/headset_service(src) + new /obj/item/radio/headset/headset_service(src) + new /obj/item/radio/headset/headset_service(src) new /obj/item/storage/box/gloves(src) new /obj/item/storage/box/mousetraps(src) new /obj/item/clothing/under/rank/chef(src) diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index b74100ec5e1..4acef02ffee 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -9,4 +9,4 @@ new /obj/item/clothing/suit/space/void(src) new /obj/item/crowbar(src) new /obj/item/cell(src) - new /obj/item/device/multitool(src) + new /obj/item/multitool(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 e45e344dabf..995b15c24ce 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -15,19 +15,19 @@ new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/blueprints(src) new /obj/item/clothing/head/welding(src) - new /obj/item/device/megaphone/engi(src) + new /obj/item/megaphone/engi(src) new /obj/item/storage/toolbox/mechanical(src) - new /obj/item/device/multitool(src) - new /obj/item/device/flash(src) + new /obj/item/multitool(src) + new /obj/item/flash(src) new /obj/item/taperoll/engineering(src) new /obj/item/rfd/piping(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) new /obj/item/clothing/accessory/holster/waist(src) - new /obj/item/device/gps/engineering(src) + new /obj/item/gps/engineering(src) new /obj/item/pipewrench(src) new /obj/item/grenade/chem_grenade/large/phoroncleaner(src) new /obj/item/crowbar/rescue_axe/red(src) - new /obj/item/device/radio/eng/off(src) + new /obj/item/radio/eng/off(src) new /obj/item/grenade/chem_grenade/antifuel(src) new /obj/item/storage/lockbox/shuttle_blueprints(src) new /obj/item/blueprints/outpost(src) @@ -47,8 +47,8 @@ /obj/item/clothing/gloves/yellow/specialu = 1, /obj/item/clothing/gloves/yellow/specialt = 1, /obj/item/clothing/shoes/workboots/brown = 1, - /obj/item/device/radio/headset/heads/ce = 1, - /obj/item/device/radio/headset/heads/ce/alt = 1, + /obj/item/radio/headset/heads/ce = 1, + /obj/item/radio/headset/heads/ce/alt = 1, /obj/item/clothing/suit/storage/hazardvest/ce = 1, /obj/item/clothing/mask/gas/alt = 1, /obj/item/clothing/mask/gas/half = 1, @@ -68,25 +68,25 @@ new /obj/item/clothing/accessory/storage/brown_vest(src) new /obj/item/clothing/accessory/storage/pouches/brown(src) new /obj/item/storage/toolbox/mechanical(src) - new /obj/item/device/radio/headset/headset_eng(src) - new /obj/item/device/radio/headset/headset_eng/alt(src) + new /obj/item/radio/headset/headset_eng(src) + new /obj/item/radio/headset/headset_eng/alt(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/taperoll/engineering(src) - new /obj/item/device/radio/eng/off(src) + new /obj/item/radio/eng/off(src) new /obj/item/storage/belt/utility(src) new /obj/item/storage/belt/utility/alt(src) - new /obj/item/device/gps/engineering(src) + new /obj/item/gps/engineering(src) new /obj/item/pipewrench(src) - new /obj/item/device/flashlight/heavy(src) + new /obj/item/flashlight/heavy(src) new /obj/item/grenade/chem_grenade/antifuel(src) new /obj/item/clothing/gloves/yellow(src) new /obj/item/clothing/gloves/yellow/specialu(src) new /obj/item/clothing/gloves/yellow/specialt(src) // Painters - new /obj/item/device/paint_sprayer(src) - new /obj/item/device/pipe_painter(src) + new /obj/item/paint_sprayer(src) + new /obj/item/pipe_painter(src) // Atmospherics Technician /obj/structure/closet/secure_closet/atmos_personal @@ -101,26 +101,26 @@ new /obj/item/clothing/accessory/storage/pouches/brown(src) new /obj/item/clothing/suit/fire/atmos(src) new /obj/item/extinguisher(src) - new /obj/item/device/radio/headset/headset_eng(src) - new /obj/item/device/radio/headset/headset_eng/alt(src) + new /obj/item/radio/headset/headset_eng(src) + new /obj/item/radio/headset/headset_eng/alt(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/taperoll/engineering(src) new /obj/item/reagent_containers/extinguisher_refill(src) new /obj/item/rfd/piping(src) - new /obj/item/device/radio/eng/off(src) + new /obj/item/radio/eng/off(src) new /obj/item/storage/belt/utility(src) new /obj/item/storage/belt/utility/alt(src) - new /obj/item/device/gps/engineering(src) + new /obj/item/gps/engineering(src) new /obj/item/pipewrench(src) new /obj/item/crowbar/rescue_axe(src) - new /obj/item/device/flashlight/heavy(src) + new /obj/item/flashlight/heavy(src) new /obj/item/grenade/chem_grenade/antifuel(src) - new /obj/item/device/debugger(src) + new /obj/item/debugger(src) // Painters - new /obj/item/device/paint_sprayer(src) - new /obj/item/device/pipe_painter(src) + new /obj/item/paint_sprayer(src) + new /obj/item/pipe_painter(src) // Electrical Supplies /obj/structure/closet/secure_closet/engineering_electrical @@ -144,12 +144,12 @@ new /obj/item/module/power_control(src) new /obj/item/module/power_control(src) // 3 Multitools - new /obj/item/device/multitool(src) - new /obj/item/device/multitool(src) - new /obj/item/device/multitool(src) + new /obj/item/multitool(src) + new /obj/item/multitool(src) + new /obj/item/multitool(src) // 2 Debuggers - new /obj/item/device/debugger(src) - new /obj/item/device/debugger(src) + new /obj/item/debugger(src) + new /obj/item/debugger(src) // Welding Supplies /obj/structure/closet/secure_closet/engineering_welding diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 7c5cffa4098..a6ede05249e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -6,8 +6,8 @@ /obj/structure/closet/secure_closet/hydroponics/fill() ..() new /obj/item/storage/bag/plants(src) - new /obj/item/device/analyzer/plant_analyzer(src) - new /obj/item/device/radio/headset/headset_service(src) + new /obj/item/analyzer/plant_analyzer(src) + new /obj/item/radio/headset/headset_service(src) new /obj/item/material/minihoe(src) new /obj/item/material/hatchet(src) new /obj/item/wirecutters/clippers(src) @@ -30,8 +30,8 @@ new /obj/item/clothing/under/rank/scientist/botany(src) new /obj/item/storage/bag/plants(src) new /obj/item/clothing/under/rank/scientist(src) - new /obj/item/device/analyzer/plant_analyzer(src) - new /obj/item/device/radio/headset/headset_sci(src) + new /obj/item/analyzer/plant_analyzer(src) + new /obj/item/radio/headset/headset_sci(src) new /obj/item/clothing/head/bandana/hydro(src) new /obj/item/material/minihoe(src) new /obj/item/material/hatchet(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm b/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm index 4db89477eb9..6a6a1bfbb78 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/marooning.dm @@ -21,8 +21,8 @@ starts_with = list( // Tools /obj/item/crowbar/red = 1, - /obj/item/device/flashlight/heavy = 1, - /obj/item/device/gps/marooning_equipment = 1, + /obj/item/flashlight/heavy = 1, + /obj/item/gps/marooning_equipment = 1, /obj/item/airbubble = 1, // Rations diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 7b86b2aa62c..901b0228109 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -89,8 +89,8 @@ new /obj/item/clothing/suit/storage/toggle/labcoat/zeng(src) new /obj/item/clothing/head/headmirror new /obj/item/clothing/shoes/sneakers/medsci(src) - new /obj/item/device/radio/headset/headset_med(src) - new /obj/item/device/radio/headset/headset_med/alt(src) + new /obj/item/radio/headset/headset_med(src) + new /obj/item/radio/headset/headset_med/alt(src) new /obj/item/clothing/glasses/hud/health/aviator(src) new /obj/item/clothing/glasses/eyepatch/hud/medical(src) @@ -105,18 +105,18 @@ new /obj/item/storage/backpack/satchel/med(src) new /obj/item/storage/backpack/duffel/med(src) new /obj/item/clothing/head/hardhat/paramedic(src) - new /obj/item/device/radio/headset/headset_med(src) + new /obj/item/radio/headset/headset_med(src) new /obj/item/clothing/glasses/hud/health(src) new /obj/item/storage/backpack/medic(src) new /obj/item/clothing/accessory/storage/white_vest(src) new /obj/item/clothing/suit/storage/medical_chest_rig(src) - new /obj/item/device/flashlight/pen(src) + new /obj/item/flashlight/pen(src) new /obj/item/clothing/accessory/stethoscope(src) new /obj/item/storage/belt/medical/paramedic(src) - new /obj/item/device/gps/medical(src) + new /obj/item/gps/medical(src) new /obj/item/reagent_containers/hypospray(src) new /obj/item/taperoll/medical(src) - new /obj/item/device/radio/med(src) + new /obj/item/radio/med(src) new /obj/item/roller(src) new /obj/item/crowbar/red(src) new /obj/item/clothing/mask/gas/alt(src) @@ -138,10 +138,10 @@ new /obj/item/clothing/shoes/sneakers/medsci(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/storage/box/gloves(src) - new /obj/item/device/radio/headset/heads/cmo(src) - new /obj/item/device/radio/headset/heads/cmo/alt(src) - new /obj/item/device/megaphone/med(src) - new /obj/item/device/flash(src) + new /obj/item/radio/headset/heads/cmo(src) + new /obj/item/radio/headset/heads/cmo/alt(src) + new /obj/item/megaphone/med(src) + new /obj/item/flash(src) new /obj/item/clothing/accessory/storage/white_vest(src) new /obj/item/reagent_containers/hypospray/cmo(src) new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src) @@ -153,10 +153,10 @@ new /obj/item/storage/belt/medical(src) new /obj/item/clothing/accessory/stethoscope(src) new /obj/item/storage/box/fancy/keypouch/med(src) - new /obj/item/device/advanced_healthanalyzer(src) + new /obj/item/advanced_healthanalyzer(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) new /obj/item/clothing/accessory/holster/waist(src) - new /obj/item/device/eftpos(src) + new /obj/item/eftpos(src) /obj/structure/closet/secure_closet/CMO2 name = "chief medical officer's attire" @@ -177,7 +177,7 @@ new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src) new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src) new /obj/item/clothing/shoes/sneakers/brown (src) - new /obj/item/device/radio/headset/heads/cmo(src) + new /obj/item/radio/headset/heads/cmo(src) /obj/structure/closet/secure_closet/animal name = "animal control closet" @@ -185,10 +185,10 @@ /obj/structure/closet/secure_closet/animal/fill() ..() - new /obj/item/device/assembly/signaler(src) - new /obj/item/device/radio/electropack(src) - new /obj/item/device/radio/electropack(src) - new /obj/item/device/radio/electropack(src) + new /obj/item/assembly/signaler(src) + new /obj/item/radio/electropack(src) + new /obj/item/radio/electropack(src) + new /obj/item/radio/electropack(src) /obj/structure/closet/secure_closet/chemical name = "chemistry equipment closet" @@ -226,7 +226,7 @@ new /obj/item/toy/plushie/therapy(src) new /obj/item/toy/plushie/slime(src) new /obj/item/toy/plushie/bee(src) - new /obj/item/device/flashlight/pen(src) + new /obj/item/flashlight/pen(src) new /obj/item/storage/box/stressball(src) // Empty diff --git a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm index d4b72e93f82..c0b512c9f1e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/operations.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/operations.dm @@ -11,8 +11,8 @@ /obj/structure/closet/secure_closet/operations_manager/fill() new /obj/item/clothing/under/rank/operations_manager(src) new /obj/item/clothing/shoes/sneakers/brown(src) - new /obj/item/device/radio/headset/operations_manager(src) - new /obj/item/device/radio/headset/operations_manager/alt(src) + new /obj/item/radio/headset/operations_manager(src) + new /obj/item/radio/headset/operations_manager/alt(src) new /obj/item/storage/box/fancy/keypouch/cargo(src) new /obj/item/clothing/head/welding(src) new /obj/item/clothing/glasses/welding(src) @@ -21,16 +21,16 @@ new /obj/item/clothing/head/beret/cargo(src) new /obj/item/modular_computer/handheld/preset/supply/cargo_delivery(src) new /obj/item/export_scanner(src) - new /obj/item/device/orbital_dropper/drill(src) - new /obj/item/device/megaphone/cargo(src) + new /obj/item/orbital_dropper/drill(src) + new /obj/item/megaphone/cargo(src) new /obj/item/storage/stickersheet/goldstar(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/storage/belt/utility/full(src) - new /obj/item/device/multitool(src) - new /obj/item/device/memorywiper(src) - new /obj/item/device/price_scanner(src) - new /obj/item/device/robotanalyzer(src) + new /obj/item/multitool(src) + new /obj/item/memorywiper(src) + new /obj/item/price_scanner(src) + new /obj/item/robotanalyzer(src) // Hangar Technician /obj/structure/closet/secure_closet/hangar_tech @@ -43,15 +43,15 @@ new /obj/item/storage/backpack/industrial(src) new /obj/item/storage/backpack/duffel/eng(src) new /obj/item/clothing/under/rank/hangar_technician(src) - new /obj/item/device/radio/headset/headset_cargo(src) - new /obj/item/device/radio/headset/headset_cargo/alt(src) + new /obj/item/radio/headset/headset_cargo(src) + new /obj/item/radio/headset/headset_cargo/alt(src) new /obj/item/modular_computer/handheld/preset/supply/cargo_delivery(src) new /obj/item/export_scanner(src) - new /obj/item/device/price_scanner(src) - new /obj/item/device/cratescanner(src) + new /obj/item/price_scanner(src) + new /obj/item/cratescanner(src) new /obj/item/clipboard(src) new /obj/item/storage/belt/utility(src) - new /obj/item/device/flashlight/marshallingwand(src) + new /obj/item/flashlight/marshallingwand(src) // Machinist /obj/structure/closet/secure_closet/machinist @@ -67,9 +67,9 @@ new /obj/item/clothing/gloves/yellow(src) new /obj/item/clothing/gloves/yellow/specialu(src) new /obj/item/clothing/gloves/yellow/specialt(src) - new /obj/item/device/multitool(src) + new /obj/item/multitool(src) new /obj/item/ipc_tag_scanner(src) - new /obj/item/device/robotanalyzer(src) + new /obj/item/robotanalyzer(src) new /obj/item/storage/belt/utility(src) new /obj/item/storage/belt/utility/alt(src) new /obj/item/storage/toolbox/mechanical(src) @@ -88,19 +88,19 @@ else new /obj/item/storage/backpack/satchel/eng(src) new /obj/item/storage/backpack/duffel/eng(src) - new /obj/item/device/radio/headset/headset_cargo(src) + new /obj/item/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) - new /obj/item/device/analyzer(src) + new /obj/item/analyzer(src) new /obj/item/storage/bag/ore(src) new /obj/item/shovel(src) new /obj/item/pickaxe(src) new /obj/item/gun/custom_ka/frame01/prebuilt(src) new /obj/item/ore_detector(src) new /obj/item/key/minecarts(src) - new /obj/item/device/gps/mining(src) + new /obj/item/gps/mining(src) new /obj/item/book/manual/ka_custom(src) - new /obj/item/device/radio(src) - new /obj/item/device/flashlight/lantern(src) + new /obj/item/radio(src) + new /obj/item/flashlight/lantern(src) new /obj/item/sleeping_bag/mining(src) // Merchant @@ -122,6 +122,6 @@ new /obj/item/clothing/suit/space(src) new /obj/item/tank/oxygen(src) new /obj/item/cargo_backpack(src) - new /obj/item/device/gps/mining(src) - new /obj/item/device/flashlight/lantern(src) + new /obj/item/gps/mining(src) + new /obj/item/flashlight/lantern(src) new /obj/item/pickaxe(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 38205338b2c..5d0c46382e0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -9,8 +9,8 @@ new /obj/item/storage/backpack(src) else new /obj/item/storage/backpack/satchel(src) - new /obj/item/device/radio/headset(src) - new /obj/item/device/radio/headset/alt(src) + new /obj/item/radio/headset(src) + new /obj/item/radio/headset/alt(src) /obj/structure/closet/secure_closet/personal/patient name = "patient's closet" @@ -33,8 +33,8 @@ /obj/structure/closet/secure_closet/personal/cabinet/fill() new /obj/item/storage/backpack/satchel/leather/withwallet(src) - new /obj/item/device/radio/headset(src) - new /obj/item/device/radio/headset/alt(src) + new /obj/item/radio/headset(src) + new /obj/item/radio/headset/alt(src) /obj/structure/closet/secure_closet/personal/attackby(obj/item/attacking_item, mob/user) if (opened) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 5f334f6a6b3..9c07436e975 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -7,8 +7,8 @@ new /obj/item/clothing/under/rank/scientist(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/sneakers/medsci(src) - new /obj/item/device/radio/headset/headset_sci(src) - new /obj/item/device/radio/headset/headset_sci/alt(src) + new /obj/item/radio/headset/headset_sci(src) + new /obj/item/radio/headset/headset_sci/alt(src) new /obj/item/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/taperoll/science(src) @@ -29,24 +29,24 @@ new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/shoes/laceup/brown(src) new /obj/item/storage/box/gloves(src) - new /obj/item/device/radio/headset/heads/rd(src) - new /obj/item/device/radio/headset/heads/rd/alt(src) + new /obj/item/radio/headset/heads/rd(src) + new /obj/item/radio/headset/heads/rd/alt(src) new /obj/item/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/mask/gas/half(src) - new /obj/item/device/flash(src) + new /obj/item/flash(src) new /obj/item/storage/box/firingpinsRD(src) - new /obj/item/device/pin_extractor(src) + new /obj/item/pin_extractor(src) new /obj/item/storage/box/fancy/keypouch/sci(src) new /obj/item/aicard(src) - new /obj/item/device/paicard(src) + new /obj/item/paicard(src) new /obj/item/storage/box/tethers(src) new /obj/item/taperoll/science(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/storage/box/psireceiver(src) - new /obj/item/device/megaphone/sci(src) - new /obj/item/device/taperecorder(src) + new /obj/item/megaphone/sci(src) + new /obj/item/taperecorder(src) new /obj/item/sampler(src) new /obj/item/storage/box/shells/tranquilizer(src) new /obj/item/modular_computer/laptop/preset/supply/robotics(src) @@ -70,6 +70,6 @@ new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/shoes/laceup/brown(src) new /obj/item/clothing/gloves/latex/nitrile(src) - new /obj/item/device/radio/headset/heads/rd(src) - new /obj/item/device/radio/headset/heads/rd/alt(src) - new /obj/item/device/megaphone/sci(src) + new /obj/item/radio/headset/heads/rd(src) + new /obj/item/radio/headset/heads/rd/alt(src) + new /obj/item/megaphone/sci(src) 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 377752ac414..9f83312bb12 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -14,14 +14,14 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/suit/armor/carrier/generic(src) //Tools - new /obj/item/device/radio/headset/heads/captain(src) - new /obj/item/device/radio/headset/heads/captain/alt(src) - new /obj/item/device/megaphone/command(src) + new /obj/item/radio/headset/heads/captain(src) + new /obj/item/radio/headset/heads/captain/alt(src) + new /obj/item/megaphone/command(src) new /obj/item/gun/energy/repeater/pistol(src) - new /obj/item/device/flash(src) + new /obj/item/flash(src) new /obj/item/melee/telebaton(src) - new /obj/item/device/radio/off(src) - new /obj/item/device/taperecorder(src) + new /obj/item/radio/off(src) + new /obj/item/taperecorder(src) // uniform briefcases new /obj/item/storage/briefcase/nt/captain(src) new /obj/item/storage/briefcase/nt/captain_white(src) @@ -67,16 +67,16 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/accessory/holster/waist(src) //Tools - new /obj/item/device/radio/headset/heads/xo(src) - new /obj/item/device/radio/headset/heads/xo/alt(src) - new /obj/item/device/megaphone/command(src) + new /obj/item/radio/headset/heads/xo(src) + new /obj/item/radio/headset/heads/xo/alt(src) + new /obj/item/megaphone/command(src) new /obj/item/storage/stickersheet/goldstar(src) new /obj/item/gun/energy/repeater/pistol(src) new /obj/item/gun/projectile/sec/flash(src) - new /obj/item/device/flash(src) - new /obj/item/device/eftpos(src) + new /obj/item/flash(src) + new /obj/item/eftpos(src) new /obj/item/book/manual/wiki/security_space_law(src) - new /obj/item/device/radio/off(src) + new /obj/item/radio/off(src) /obj/structure/closet/secure_closet/xo2 name = "executive officer's attire" @@ -123,23 +123,23 @@ new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) //Tools - new /obj/item/device/radio/headset/heads/hos(src) - new /obj/item/device/radio/headset/heads/hos/alt(src) - new /obj/item/device/megaphone/sec(src) + new /obj/item/radio/headset/heads/hos(src) + new /obj/item/radio/headset/heads/hos/alt(src) + new /obj/item/megaphone/sec(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/clothing/glasses/sunglasses/sechud/head(src) new /obj/item/shield/riot/tact(src) - new /obj/item/device/flashlight/maglight(src) + new /obj/item/flashlight/maglight(src) new /obj/item/melee/telebaton(src) new /obj/item/gun/energy/repeater/pistol(src) new /obj/item/taperoll/police(src) - new /obj/item/device/breath_analyzer(src) + new /obj/item/breath_analyzer(src) new /obj/item/crowbar/red(src) new /obj/item/ipc_tag_scanner(src) - new /obj/item/device/taperecorder(src) - new /obj/item/device/binoculars(src) - new /obj/item/device/radio/sec(src) - new /obj/item/device/multitool(src) + new /obj/item/taperecorder(src) + new /obj/item/binoculars(src) + new /obj/item/radio/sec(src) + new /obj/item/multitool(src) //Belts new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/storage/belt/security/full(src) @@ -164,12 +164,12 @@ new /obj/item/clothing/head/helmet/hos(src) //Tools new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) - new /obj/item/device/radio/headset/heads/hos(src) - new /obj/item/device/radio/headset/heads/hos/alt(src) + new /obj/item/radio/headset/heads/hos(src) + new /obj/item/radio/headset/heads/hos/alt(src) //Belts new /obj/item/storage/belt/security(src) new /obj/item/clothing/accessory/holster/waist(src) - new /obj/item/device/breath_analyzer(src) + new /obj/item/breath_analyzer(src) /obj/structure/closet/secure_closet/warden name = "warden's locker" @@ -196,24 +196,24 @@ new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) //Tools - new /obj/item/device/radio/headset/headset_warden(src) - new /obj/item/device/radio/headset/headset_warden/alt(src) + new /obj/item/radio/headset/headset_warden(src) + new /obj/item/radio/headset/headset_warden/alt(src) new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/taperoll/police(src) new /obj/item/gun/energy/disruptorpistol(src) - new /obj/item/device/breath_analyzer(src) + new /obj/item/breath_analyzer(src) //Belts new /obj/item/clothing/accessory/storage/black_vest(src) new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/storage/belt/security/full(src) new /obj/item/storage/belt/security/vestbelt(src) // Utility - new /obj/item/device/radio/sec(src) + new /obj/item/radio/sec(src) new /obj/item/crowbar(src) - new /obj/item/device/flashlight/maglight(src) + new /obj/item/flashlight/maglight(src) new /obj/item/wrench(src) - new /obj/item/device/multitool(src) + new /obj/item/multitool(src) /obj/structure/closet/secure_closet/security_cadet @@ -232,14 +232,14 @@ new /obj/item/clothing/suit/storage/hazardvest/security(src) new /obj/item/clothing/under/rank/cadet(src) //Tools - new /obj/item/device/radio/headset/headset_sec(src) - new /obj/item/device/radio/headset/headset_sec/alt(src) - new /obj/item/device/flash(src) + new /obj/item/radio/headset/headset_sec(src) + new /obj/item/radio/headset/headset_sec/alt(src) + new /obj/item/flash(src) new /obj/item/reagent_containers/spray/pepper(src) new /obj/item/taperoll/police(src) - new /obj/item/device/hailer(src) - new /obj/item/device/holowarrant(src) - new /obj/item/device/flashlight/flare/glowstick/red(src) + new /obj/item/hailer(src) + new /obj/item/holowarrant(src) + new /obj/item/flashlight/flare/glowstick/red(src) //Belts new /obj/item/clothing/accessory/storage/black_vest(src) new /obj/item/clothing/accessory/storage/pouches/black(src) @@ -265,15 +265,15 @@ new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) //Tools - new /obj/item/device/radio/headset/headset_sec(src) - new /obj/item/device/radio/headset/headset_sec/alt(src) + new /obj/item/radio/headset/headset_sec(src) + new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/gun/energy/disruptorpistol/security(src) new /obj/item/taperoll/police(src) - new /obj/item/device/hailer(src) - new /obj/item/device/flashlight/flare/glowstick/red(src) - new /obj/item/device/breath_analyzer(src) + new /obj/item/hailer(src) + new /obj/item/flashlight/flare/glowstick/red(src) + new /obj/item/breath_analyzer(src) //Belts new /obj/item/clothing/accessory/storage/black_vest(src) new /obj/item/clothing/accessory/storage/pouches/black(src) @@ -297,12 +297,12 @@ new /obj/item/clothing/accessory/badge/investigator(src) new /obj/item/clothing/mask/gas/half(src) //Tools - new /obj/item/device/radio/headset/headset_sec(src) - new /obj/item/device/radio/headset/headset_sec/alt(src) + new /obj/item/radio/headset/headset_sec(src) + new /obj/item/radio/headset/headset_sec/alt(src) new /obj/item/clothing/suit/armor/carrier/officer(src) new /obj/item/gun/energy/disruptorpistol/miniature/security(src) - new /obj/item/device/laser_pointer/blue(src) - new /obj/item/device/camera_film(src) + new /obj/item/laser_pointer/blue(src) + new /obj/item/camera_film(src) new /obj/item/stamp/investigations(src) new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) @@ -377,10 +377,10 @@ new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/gun/energy/disruptorpistol/miniature(src) - new /obj/item/device/radio/headset/headset_com(src) - new /obj/item/device/radio/headset/headset_com/alt(src) - new /obj/item/device/radio/off(src) - new /obj/item/device/gps(src) + new /obj/item/radio/headset/headset_com(src) + new /obj/item/radio/headset/headset_com/alt(src) + new /obj/item/radio/off(src) + new /obj/item/gps(src) // Evidence Storage Locker /obj/structure/closet/secure_closet/evidence diff --git a/code/game/objects/structures/crates_lockers/closets/secure/service.dm b/code/game/objects/structures/crates_lockers/closets/secure/service.dm index caabe83a276..9cd30c1dfc1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/service.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/service.dm @@ -6,24 +6,24 @@ req_access = list(ACCESS_JANITOR) /obj/structure/closet/secure_closet/custodial/fill() - new /obj/item/device/radio/headset/headset_service(src) + new /obj/item/radio/headset/headset_service(src) new /obj/item/storage/box/janitorgloves(src) new /obj/item/storage/belt/custodial(src) new /obj/item/clothing/accessory/holster/utility/custodial/hip(src) new /obj/item/clothing/accessory/holster/utility/custodial/armpit(src) new /obj/item/clothing/shoes/galoshes(src) new /obj/item/gun/energy/mousegun(src) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) new /obj/item/reagent_containers/spray/cleaner(src) new /obj/item/soap/nanotrasen(src) new /obj/item/reagent_containers/glass/rag(src) new /obj/item/reagent_containers/glass/rag/advanced(src) - new /obj/item/device/lightreplacer(src) + new /obj/item/lightreplacer(src) new /obj/item/storage/bag/trash(src) new /obj/item/grenade/chem_grenade/cleaner(src) new /obj/item/grenade/chem_grenade/cleaner(src) new /obj/item/grenade/chem_grenade/cleaner(src) - new /obj/item/device/gps/janitor(src) + new /obj/item/gps/janitor(src) new /obj/item/taperoll/custodial(src) new /obj/item/storage/box/lights/mixed(src) new /obj/item/storage/box/mousetraps(src) @@ -37,11 +37,11 @@ new /obj/item/storage/box/janitorgloves(src) new /obj/item/storage/belt/custodial(src) new /obj/item/clothing/shoes/galoshes(src) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) new /obj/item/reagent_containers/spray/cleaner(src) new /obj/item/soap/red_soap(src) new /obj/item/reagent_containers/glass/rag(src) - new /obj/item/device/lightreplacer(src) + new /obj/item/lightreplacer(src) new /obj/item/storage/bag/trash(src) new /obj/item/grenade/chem_grenade/cleaner(src) new /obj/item/grenade/chem_grenade/cleaner(src) @@ -62,11 +62,11 @@ /obj/structure/closet/secure_closet/journalist/fill() new /obj/item/storage/photo_album(src) - new /obj/item/device/camera_film(src) - new /obj/item/device/camera(src) + new /obj/item/camera_film(src) + new /obj/item/camera(src) new /obj/item/paper_scanner(src) new /obj/item/folder/white(src) new /obj/item/storage/secure/briefcase(src) new /obj/item/clipboard(src) new /obj/item/folder/red(src) - new /obj/item/device/tvcamera(src) + new /obj/item/tvcamera(src) diff --git a/code/game/objects/structures/crates_lockers/closets/sol_gear.dm b/code/game/objects/structures/crates_lockers/closets/sol_gear.dm index 5b8d924aca3..3e6d56c4393 100644 --- a/code/game/objects/structures/crates_lockers/closets/sol_gear.dm +++ b/code/game/objects/structures/crates_lockers/closets/sol_gear.dm @@ -147,10 +147,10 @@ new /obj/item/clothing/suit/storage/vest(src) new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/shoes/laceup(src) - new /obj/item/device/radio/headset/heads/captain(src) + new /obj/item/radio/headset/heads/captain(src) new /obj/item/clothing/gloves/white(src) new /obj/item/gun/energy/pistol(src) - new /obj/item/device/flash(src) + new /obj/item/flash(src) new /obj/item/melee/telebaton(src) new /obj/item/melee/ceremonial_sword(src) new /obj/item/clothing/under/rank/sol(src) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index f9a0ac5f584..c5c96d3dee6 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -15,7 +15,7 @@ new /obj/item/crowbar/red(src) new /obj/item/cell/high(src) new /obj/item/card/id/syndicate(src) - new /obj/item/device/multitool(src) + new /obj/item/multitool(src) new /obj/item/shield/energy(src) new /obj/item/clothing/shoes/magboots/syndie(src) @@ -54,7 +54,7 @@ new /obj/item/pinpointer/nukeop(src) new /obj/item/pinpointer/nukeop(src) new /obj/item/modular_computer/handheld/pda/syndicate(src) - var/obj/item/device/radio/uplink/U = new(src) + var/obj/item/radio/uplink/U = new(src) U.hidden_uplink.telecrystals = 40 U.hidden_uplink.bluecrystals = 20 return 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 4cb84b75d2b..11d6bb5e5a9 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -27,7 +27,7 @@ new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/suit/space/emergency(src) new /obj/item/clothing/head/helmet/space/emergency(src) - new /obj/item/device/oxycandle(src) + new /obj/item/oxycandle(src) new /obj/item/airbubble(src) if ("aid") new /obj/item/tank/emergency_oxygen(src) @@ -36,7 +36,7 @@ new /obj/item/storage/firstaid/o2(src) new /obj/item/clothing/suit/space/emergency(src) new /obj/item/clothing/head/helmet/space/emergency(src) - new /obj/item/device/oxycandle(src) + new /obj/item/oxycandle(src) new /obj/item/airbubble(src) if ("tank") new /obj/item/tank/emergency_oxygen/engi(src) @@ -44,8 +44,8 @@ new /obj/item/tank/emergency_oxygen/engi(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) - new /obj/item/device/oxycandle(src) - new /obj/item/device/oxycandle(src) + new /obj/item/oxycandle(src) + new /obj/item/oxycandle(src) new /obj/item/airbubble(src) if ("seal") new /obj/item/tank/emergency_oxygen(src) @@ -53,7 +53,7 @@ new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/suit/space/emergency(src) new /obj/item/clothing/head/helmet/space/emergency(src) - new /obj/item/device/oxycandle(src) + new /obj/item/oxycandle(src) new /obj/item/storage/bag/inflatable/emergency(src) if ("all") new /obj/item/storage/toolbox/emergency(src) @@ -66,9 +66,9 @@ new /obj/item/clothing/suit/space/emergency(src) new /obj/item/clothing/head/helmet/space/emergency(src) new /obj/item/clothing/head/helmet/space/emergency(src) - new /obj/item/device/oxycandle(src) - new /obj/item/device/oxycandle(src) - new /obj/item/device/oxycandle(src) + new /obj/item/oxycandle(src) + new /obj/item/oxycandle(src) + new /obj/item/oxycandle(src) new /obj/item/airbubble(src) new /obj/item/airbubble(src) new /obj/item/storage/bag/inflatable/emergency(src) @@ -109,10 +109,10 @@ new /obj/item/clothing/suit/space/emergency(src) new /obj/item/tank/emergency_oxygen(src) new /obj/item/tank/emergency_oxygen(src) - new /obj/item/device/oxycandle(src) - new /obj/item/device/oxycandle(src) - new /obj/item/device/oxycandle(src) - new /obj/item/device/oxycandle(src) + new /obj/item/oxycandle(src) + new /obj/item/oxycandle(src) + new /obj/item/oxycandle(src) + new /obj/item/oxycandle(src) /* * Fire Closet @@ -138,7 +138,7 @@ new /obj/item/clothing/suit/fire(src) new /obj/item/clothing/mask/gas/alt(src) new /obj/item/crowbar/rescue_axe/red(src) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) new /obj/item/tank/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/storage/bag/inflatable/emergency(src) @@ -156,7 +156,7 @@ if(prob(40)) new /obj/item/clothing/suit/storage/hazardvest(src) if(prob(70)) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) if(prob(70)) new /obj/item/screwdriver(src) if(prob(70)) @@ -168,7 +168,7 @@ if(prob(70)) new /obj/item/wirecutters(src) if(prob(70)) - new /obj/item/device/t_scanner(src) + new /obj/item/t_scanner(src) if(prob(20)) new /obj/item/storage/belt/utility(src) if(prob(20)) @@ -180,7 +180,7 @@ if(prob(30)) new /obj/item/stack/cable_coil/random(src) if(prob(20)) - new /obj/item/device/multitool(src) + new /obj/item/multitool(src) if(prob(5)) new /obj/item/clothing/gloves/yellow(src) if(prob(40)) @@ -204,7 +204,7 @@ new /obj/item/clothing/suit/radiation(src) new /obj/item/clothing/glasses/safety/goggles(src) new /obj/item/storage/firstaid/radiation(src) - new /obj/item/device/geiger(src) + new /obj/item/geiger(src) /* * Bombsuit closet @@ -232,4 +232,4 @@ new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/head/bomb_hood/security(src) new /obj/item/wirecutters/bomb(src) - new /obj/item/device/mine_detector(src) + new /obj/item/mine_detector(src) diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index bf51a764e1c..4d85c574bd7 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -64,7 +64,7 @@ new /obj/item/clothing/head/hardhat/firefighter(src) new /obj/item/clothing/suit/fire(src) new /obj/item/clothing/mask/gas/alt(src) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) new /obj/item/crowbar/rescue_axe/red(src) new /obj/item/tank/oxygen/red(src) new /obj/item/extinguisher(src) @@ -79,7 +79,7 @@ new /obj/item/clothing/head/hardhat/firefighter(src) new /obj/item/clothing/suit/fire(src) new /obj/item/clothing/mask/gas/alt(src) - new /obj/item/device/flashlight(src) + new /obj/item/flashlight(src) new /obj/item/tank/oxygen/red(src) new /obj/item/extinguisher(src) new /obj/item/ladder_mobile(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 83514433127..6774033f4d7 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -88,7 +88,7 @@ new /obj/item/storage/box/fancy/candle_box(src) new /obj/item/storage/box/fancy/candle_box(src) new /obj/item/deck/tarot(src) - new /obj/item/device/radio/headset/headset_service(src) + new /obj/item/radio/headset/headset_service(src) new /obj/item/spirit_board(src) new /obj/item/mesmetron(src) new /obj/item/toy/plushie/therapy(src) diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index db4014cee95..25d4f7384ab 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -78,7 +78,7 @@ new /obj/item/ammo_magazine/gauss(src) new /obj/item/ammo_magazine/gauss(src) new /obj/item/ammo_magazine/gauss/emp(src) - new /obj/item/device/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) new /obj/item/voidsuit_modkit_multi/coalition(src) /obj/structure/closet/crate/secure/gear_loadout/eridani/fill() @@ -169,7 +169,7 @@ new /obj/item/gun/projectile/pistol(src) new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/grenade/chem_grenade/large/phoroncleaner(src) - new /obj/item/device/modkit/ipc(src) + new /obj/item/modkit/ipc(src) /obj/structure/closet/crate/secure/gear_loadout/sol/fill() new /obj/item/clothing/under/rank/sol/marine(src) @@ -288,7 +288,7 @@ new /obj/item/clothing/suit/space/void/zenghu(src) new /obj/item/tank/oxygen/red(src) new /obj/item/clothing/shoes/magboots(src) - new /obj/item/device/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/gear_loadout/nanotrasen/suit/fill() new /obj/item/rig/nanotrasen(src) @@ -299,14 +299,14 @@ new /obj/item/clothing/suit/space/void/hephaestus(src) new /obj/item/tank/oxygen/red(src) new /obj/item/clothing/shoes/magboots(src) - new /obj/item/device/modkit/unathi(src) + new /obj/item/modkit/unathi(src) /obj/structure/closet/crate/gear_loadout/einstein/suit/fill() new /obj/item/clothing/head/helmet/space/void/einstein(src) new /obj/item/clothing/suit/space/void/einstein(src) new /obj/item/tank/oxygen/red(src) new /obj/item/clothing/shoes/magboots(src) - new /obj/item/device/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/secure/gear_loadout/dominia/fill() new /obj/item/clothing/under/dominia/fleet(src) @@ -390,7 +390,7 @@ new /obj/item/melee/energy/sword/pirate(src) new /obj/item/shield/energy/dominia(src) new /obj/item/voidsuit_modkit/dominianvoid(src) - new /obj/item/device/modkit/unathi(src) + new /obj/item/modkit/unathi(src) /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/fill() new /obj/item/clothing/under/tajaran/cosmonaut(src) @@ -432,7 +432,7 @@ new /obj/item/gun/projectile/deagle/adhomai(src) new /obj/item/ammo_magazine/a50(src) new /obj/item/ammo_magazine/a50(src) - new /obj/item/device/augment_implanter/advanced_tesla(src) + new /obj/item/augment_implanter/advanced_tesla(src) /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single/fill() new /obj/item/clothing/under/tajaran/cosmonaut(src) @@ -572,7 +572,7 @@ new /obj/item/suppressor(src) new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/ammo_magazine/mc9mm(src) - new /obj/item/device/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/gear_loadout/ceres/fill() new /obj/item/rig/bunker/nerfed/equipped(src) @@ -906,7 +906,7 @@ new /obj/item/ammo_magazine/a357(src) new /obj/item/gun/projectile/gauss(src) //1 tungsten slug gun w/spare magazine new /obj/item/ammo_magazine/gauss(src) - new /obj/item/device/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/gear_loadout/qukala/fill() new /obj/item/clothing/under/skrell/qukala(src) @@ -1099,7 +1099,7 @@ new /obj/item/clothing/head/helmet/tcaf/tcaf_visor(src) new /obj/item/gun/energy/blaster/tcaf(src) new /obj/item/storage/belt/military(src) - new /obj/item/device/modkit/multi_species(src) + new /obj/item/modkit/multi_species(src) /obj/structure/closet/crate/secure/gear_loadout/exclusionist/fill() new /obj/item/clothing/under/gearharness(src) @@ -1218,10 +1218,10 @@ new /obj/item/clothing/shoes/magboots(src) new /obj/item/clothing/shoes/magboots(src) new /obj/item/clothing/shoes/magboots(src) - new /obj/item/device/suit_cooling_unit(src) - new /obj/item/device/suit_cooling_unit(src) - new /obj/item/device/suit_cooling_unit(src) - new /obj/item/device/suit_cooling_unit(src) + new /obj/item/suit_cooling_unit(src) + new /obj/item/suit_cooling_unit(src) + new /obj/item/suit_cooling_unit(src) + new /obj/item/suit_cooling_unit(src) /obj/structure/closet/crate/secure/gear_loadout/hoplan/single/fill() new /obj/item/clothing/shoes/jackboots(src) @@ -1247,7 +1247,7 @@ new /obj/item/clothing/head/helmet/space/void/golden_deep/hoplan(src) new /obj/item/clothing/suit/space/void/golden_deep/hoplan(src) new /obj/item/clothing/shoes/magboots(src) - new /obj/item/device/suit_cooling_unit(src) + new /obj/item/suit_cooling_unit(src) //ninja stuff /obj/structure/closet/crate/secure/gear_loadout/ninja @@ -1296,7 +1296,7 @@ /obj/structure/closet/crate/secure/gear_loadout/ninja/tesla/fill() ..() - new /obj/item/device/augment_implanter/advanced_tesla(src) + new /obj/item/augment_implanter/advanced_tesla(src) new /obj/item/clothing/accessory/holster/armpit/brown(src) new /obj/item/gun/projectile/pistol/adhomai(src) new /obj/item/ammo_magazine/mc9mm(src) @@ -1417,7 +1417,7 @@ new /obj/item/reagent_containers/food/snacks/koisbar(src) new /obj/item/reagent_containers/food/snacks/koisbar(src) new /obj/item/gun/energy/vaurca/blaster(src) - new /obj/item/device/augment_implanter/hivenet_warfare(src) + new /obj/item/augment_implanter/hivenet_warfare(src) /obj/structure/closet/crate/secure/gear_loadout/ninja/skrell associated_hardsuit = /obj/item/rig/skrell/tup/ninja diff --git a/code/game/objects/structures/fluff/engineering/maintenance.dm b/code/game/objects/structures/fluff/engineering/maintenance.dm index 28f68a96444..2a3741d0a90 100644 --- a/code/game/objects/structures/fluff/engineering/maintenance.dm +++ b/code/game/objects/structures/fluff/engineering/maintenance.dm @@ -116,7 +116,7 @@ ABSTRACT_TYPE(/obj/structure/engineer_maintenance) panel_tools = list( /obj/item/pipewrench = /singleton/engineer_maintenance_tool/steam_pipe, /obj/item/hammer = /singleton/engineer_maintenance_tool/steam_pipe, - /obj/item/device/multitool = /singleton/engineer_maintenance_tool/steam_pipe + /obj/item/multitool = /singleton/engineer_maintenance_tool/steam_pipe ) /obj/structure/engineer_maintenance/pipe/wall @@ -145,7 +145,7 @@ ABSTRACT_TYPE(/obj/structure/engineer_maintenance) panel_tools = list( /obj/item/wirecutters = /singleton/engineer_maintenance_tool/electrical_spark, /obj/item/stack/cable_coil = /singleton/engineer_maintenance_tool/electrical_spark, - /obj/item/device/multitool = /singleton/engineer_maintenance_tool/electrical_hum + /obj/item/multitool = /singleton/engineer_maintenance_tool/electrical_hum ) /obj/structure/engineer_maintenance/electric/wall diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 73897da5d22..dc731a02a07 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -235,7 +235,7 @@ attacking_item.pixel_x = 10 //make sure they reach the pillow attacking_item.pixel_y = -6 - else if(istype(attacking_item, /obj/item/device/paint_sprayer)) + else if(istype(attacking_item, /obj/item/paint_sprayer)) return else if(!istype(attacking_item, /obj/item/bedsheet)) diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 5295b18236d..1e6306316fc 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -146,7 +146,7 @@ /obj/item/storage/box/fancy/cigarettes = 3, /obj/item/storage/box/fancy/cigarettes/acmeco = 3, /obj/item/storage/box/fancy/cigarettes/blank = 3, - /obj/item/device/radio/headset = 3, + /obj/item/radio/headset = 3, /obj/item/camera_assembly = 3, /obj/item/clothing/head/cone = 3, /obj/item/cell/high = 3, @@ -164,9 +164,9 @@ /obj/item/clothing/shoes/galoshes = 2, /obj/item/clothing/pants/camo = 2, /obj/item/clothing/under/syndicate/tacticool = 2, - /obj/item/device/camera = 2, - /obj/item/device/flashlight/flare = 2, - /obj/item/device/flashlight/flare/glowstick/random = 2, + /obj/item/camera = 2, + /obj/item/flashlight/flare = 2, + /obj/item/flashlight/flare/glowstick/random = 2, /obj/item/cell/super = 2, /obj/item/contraband/poster = 2, /obj/item/reagent_containers/glass/rag = 2, @@ -208,7 +208,7 @@ /obj/item/handcuffs/legcuffs = 2, /obj/item/grenade/chem_grenade/gas = 2, /obj/item/clothing/suit/storage/vest/heavy = 1, - /obj/item/device/radiojammer = 1, + /obj/item/radiojammer = 1, /obj/item/trap = 1, /obj/item/cell/hyper/empty = 1, /obj/item/material/knife/tacknife = 1, diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 2ee483ca918..8a51cb4d57d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -186,7 +186,7 @@ G.clean_blood() /obj/machinery/shower/attackby(obj/item/attacking_item, mob/user) - if(attacking_item.type == /obj/item/device/analyzer) + if(attacking_item.type == /obj/item/analyzer) to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp].")) if(attacking_item.tool_behaviour == TOOL_WRENCH) var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 7c1e82abc94..ae374ff897e 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -359,8 +359,8 @@ dismantle_wall() return - if(istype(attacking_item, /obj/item/device/electronic_assembly/wallmount)) - var/obj/item/device/electronic_assembly/wallmount/IC = attacking_item + if(istype(attacking_item, /obj/item/electronic_assembly/wallmount)) + var/obj/item/electronic_assembly/wallmount/IC = attacking_item IC.mount_assembly(src, user) return diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 981daf3d455..e2759d4ca3e 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -952,7 +952,7 @@ if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") return - if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) + if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") return @@ -1590,7 +1590,7 @@ return 0 /mob/living/carbon/human/can_centcom_reply() - return istype(l_ear, /obj/item/device/radio/headset) || istype(r_ear, /obj/item/device/radio/headset) + return istype(l_ear, /obj/item/radio/headset) || istype(r_ear, /obj/item/radio/headset) /mob/living/silicon/ai/can_centcom_reply() return common_radio != null && !check_unable(2) diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm index 4ef1a60e5d5..031b01fd0e3 100644 --- a/code/modules/admin/verbs/bluespacetech.dm +++ b/code/modules/admin/verbs/bluespacetech.dm @@ -53,7 +53,7 @@ //Items var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/centcom_officer/bst(bst) bst.equip_to_slot_or_del(U, slot_w_uniform) - bst.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/bst(bst), slot_l_ear) + bst.equip_to_slot_or_del(new /obj/item/radio/headset/ert/bst(bst), slot_l_ear) bst.equip_to_slot_or_del(new /obj/item/storage/backpack/holding/bst(bst), slot_back) bst.equip_to_slot_or_del(new /obj/item/storage/box/survival(bst.back), slot_in_backpack) bst.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black/bst(bst), slot_shoes) @@ -65,9 +65,9 @@ bst.equip_to_slot_or_del(new /obj/item/storage/box/ids(bst), slot_r_hand) else bst.equip_to_slot_or_del(new /obj/item/storage/box/ids(bst.back), slot_in_backpack) - bst.equip_to_slot_or_del(new /obj/item/device/t_scanner(bst.back), slot_in_backpack) + bst.equip_to_slot_or_del(new /obj/item/t_scanner(bst.back), slot_in_backpack) bst.equip_to_slot_or_del(new /obj/item/modular_computer/handheld/pda/command/bst(bst.back), slot_in_backpack) - bst.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(bst.back), slot_in_backpack) + bst.equip_to_slot_or_del(new /obj/item/healthanalyzer(bst.back), slot_in_backpack) bst.equip_to_slot_or_del(new /obj/item/research(bst.back), slot_in_backpack) var/obj/item/storage/box/pills = new /obj/item/storage/box(null, TRUE) @@ -353,16 +353,16 @@ max_w_class = WEIGHT_CLASS_GIGANTIC //Headset -/obj/item/device/radio/headset/ert/bst +/obj/item/radio/headset/ert/bst name = "bluespace technician's headset" desc = "A Bluespace Technician's headset. The letters 'BST' are stamped on the side." translate_binary = 1 translate_hivenet = 1 canremove = 0 - keyslot1 = new /obj/item/device/encryptionkey/binary - keyslot2 = new /obj/item/device/encryptionkey/ert + keyslot1 = new /obj/item/encryptionkey/binary + keyslot2 = new /obj/item/encryptionkey/ert -/obj/item/device/radio/headset/ert/bst/attack_hand() +/obj/item/radio/headset/ert/bst/attack_hand() if(!usr) return if(!istype(usr, /mob/living/carbon/human/bst)) @@ -372,7 +372,7 @@ ..() // overload this so we can force translate flags without the required keys -/obj/item/device/radio/headset/ert/bst/recalculateChannels(var/setDescription = 0) +/obj/item/radio/headset/ert/bst/recalculateChannels(var/setDescription = 0) ..(setDescription) translate_binary = 1 translate_hivenet = 1 diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 71b6cdb3ba0..cbfd73fbf88 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -234,7 +234,7 @@ if(!(A.type in areas_with_LS)) areas_with_LS.Add(A.type) - for(var/obj/item/device/radio/intercom/I in world) + for(var/obj/item/radio/intercom/I in world) var/area/A = get_area(I) if(!(A.type in areas_with_intercom)) areas_with_intercom.Add(A.type) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 8b4134c3d25..2ab72c11f2c 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -117,7 +117,7 @@ GLOBAL_VAR_INIT(intercom_range_display_status, 0) qdel(M) if(GLOB.intercom_range_display_status) - for(var/obj/item/device/radio/intercom/I in world) + for(var/obj/item/radio/intercom/I in world) for(var/turf/T in orange(7,I)) var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T) if (!(F in view(7,I.loc))) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index f851d8743db..299423792fb 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly +/obj/item/assembly name = "assembly" desc = "A small electronic device that should never exist." icon = 'icons/obj/assemblies/new_assemblies.dmi' @@ -16,7 +16,7 @@ var/secured = TRUE var/list/attached_overlays = null - var/obj/item/device/assembly_holder/holder = null + var/obj/item/assembly_holder/holder = null var/cooldown = 0 //To prevent spam /** @@ -33,7 +33,7 @@ */ var/wires = WIRE_RECEIVE_ASSEMBLY | WIRE_PULSE_ASSEMBLY -/obj/item/device/assembly/Destroy() +/obj/item/assembly/Destroy() STOP_PROCESSING(SSprocessing, src) holder = null @@ -42,11 +42,11 @@ . = ..() -/obj/item/device/assembly/proc/holder_movement() +/obj/item/assembly/proc/holder_movement() return //Called via spawn(10) to have it count down the cooldown var -/obj/item/device/assembly/proc/process_cooldown() +/obj/item/assembly/proc/process_cooldown() cooldown-- if(cooldown <= 0) return FALSE @@ -54,7 +54,7 @@ return TRUE // Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs -/obj/item/device/assembly/proc/pulsed(var/radio = 0) +/obj/item/assembly/proc/pulsed(var/radio = 0) if(holder && (wires & WIRE_RECEIVE_ASSEMBLY)) activate() if(radio && (wires & WIRE_RADIO_RECEIVE)) @@ -62,36 +62,36 @@ return TRUE // Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct -/obj/item/device/assembly/proc/pulse(var/radio = 0) +/obj/item/assembly/proc/pulse(var/radio = 0) if(holder && (wires & WIRE_PULSE_ASSEMBLY)) holder.process_activation(src, TRUE, FALSE) if(holder && (wires & WIRE_PULSE_SPECIAL)) holder.process_activation(src, FALSE, TRUE) return TRUE -/obj/item/device/assembly/proc/activate() +/obj/item/assembly/proc/activate() if(!secured || cooldown) return FALSE cooldown = 2 addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECOND) return TRUE -/obj/item/device/assembly/proc/toggle_secure() +/obj/item/assembly/proc/toggle_secure() secured = !secured update_icon() return secured // Called when an assembly is attacked by another -/obj/item/device/assembly/proc/attach_assembly(var/obj/item/device/assembly/A, var/mob/user) - holder = new /obj/item/device/assembly_holder(get_turf(src)) +/obj/item/assembly/proc/attach_assembly(var/obj/item/assembly/A, var/mob/user) + holder = new /obj/item/assembly_holder(get_turf(src)) if(holder.attach(A, src, user)) to_chat(user, SPAN_NOTICE("You attach \the [A] to \the [src]!")) return TRUE return FALSE -/obj/item/device/assembly/attackby(obj/item/attacking_item, mob/user) +/obj/item/assembly/attackby(obj/item/attacking_item, mob/user) if(isassembly(attacking_item)) - var/obj/item/device/assembly/A = attacking_item + var/obj/item/assembly/A = attacking_item if(!A.secured && !secured) attach_assembly(A, user) return @@ -101,31 +101,31 @@ return return ..() -/obj/item/device/assembly/process() +/obj/item/assembly/process() STOP_PROCESSING(SSprocessing, src) return -/obj/item/device/assembly/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/assembly/feedback_hints(mob/user, distance, is_adjacent) . += ..() if((distance <= 1 || loc == user) && !secured) . += SPAN_NOTICE("\The [src] can be attached!") -/obj/item/device/assembly/attack_self(mob/user) +/obj/item/assembly/attack_self(mob/user) if(!user) return FALSE interact(user) return TRUE -/obj/item/device/assembly/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) +/obj/item/assembly/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER -/obj/item/device/assembly/interact(mob/user) +/obj/item/assembly/interact(mob/user) return -/obj/item/device/assembly/ui_host(mob/user) +/obj/item/assembly/ui_host(mob/user) . = ..() // Sets the UI host to the transfer valve if its mounted on a transfer_valve - if(istype(loc,/obj/item/device/transfer_valve)) + if(istype(loc,/obj/item/transfer_valve)) return loc return holder || . diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index f702df3e072..7c9cbf87bcb 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -1,4 +1,4 @@ -/obj/item/device/onetankbomb +/obj/item/onetankbomb name = "bomb" icon = 'icons/obj/tank.dmi' item_state = "assembly" @@ -9,22 +9,22 @@ obj_flags = OBJ_FLAG_CONDUCTABLE movable_flags = MOVABLE_FLAG_PROXMOVE var/status = FALSE // FALSE - not readied // TRUE - bomb finished with welder - var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device + var/obj/item/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/tank/bombtank = null //the second part of the bomb is a phoron tank -/obj/item/device/onetankbomb/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) +/obj/item/onetankbomb/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() examinate(user, bombtank, show_extended) -/obj/item/device/onetankbomb/update_icon() +/obj/item/onetankbomb/update_icon() if(bombtank) icon_state = bombtank.icon_state if(bombassembly) AddOverlays(bombassembly) AddOverlays("bomb_assembly") -/obj/item/device/onetankbomb/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/analyzer)) +/obj/item/onetankbomb/attackby(obj/item/attacking_item, mob/user) + if(istype(attacking_item, /obj/item/analyzer)) bombtank.attackby(attacking_item, user) return if(!status && (attacking_item.tool_behaviour == TOOL_WRENCH || istype(attacking_item, /obj/item/wirecutters/bomb))) //This is basically bomb assembly code inverted. apparently it works. @@ -57,17 +57,17 @@ add_fingerprint(user) ..() -/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly +/obj/item/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly bombassembly.attack_self(user, TRUE) add_fingerprint(user) return -/obj/item/device/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. +/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. visible_message("[icon2html(src, viewers(get_turf(src)))] *beep* *beep*", "*beep* *beep*") addtimer(CALLBACK(src, PROC_REF(delayed_explosion)), 10 SECONDS) -/obj/item/device/onetankbomb/proc/delayed_explosion() +/obj/item/onetankbomb/proc/delayed_explosion() if(QDELETED(src)) return if(status) @@ -75,21 +75,21 @@ else bombtank.release() -/obj/item/device/onetankbomb/HasProximity(atom/movable/AM as mob|obj) +/obj/item/onetankbomb/HasProximity(atom/movable/AM as mob|obj) if(bombassembly) bombassembly.HasProximity(AM) // ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ---------- /obj/item/tank/proc/bomb_assemble(W, user) //Bomb assembly proc. This turns assembly+tank into a bomb - var/obj/item/device/assembly_holder/S = W + var/obj/item/assembly_holder/S = W var/mob/M = user if(!S.secured) //Check if the assembly is secured return if(isigniter(S.a_left) == isigniter(S.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it return - var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc) + var/obj/item/onetankbomb/R = new /obj/item/onetankbomb(loc) //this is really bad code, TODO: Make it better M.drop_item() //Remove the assembly from your hands diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index 152d34fbcba..80e59de2940 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -1,20 +1,20 @@ /proc/isassembly(O) - return istype(O, /obj/item/device/assembly) + return istype(O, /obj/item/assembly) /proc/isigniter(O) - return istype(O, /obj/item/device/assembly/igniter) + return istype(O, /obj/item/assembly/igniter) /proc/isinfared(O) - return istype(O, /obj/item/device/assembly/infra) + return istype(O, /obj/item/assembly/infra) /proc/isprox(O) - return istype(O, /obj/item/device/assembly/prox_sensor) + return istype(O, /obj/item/assembly/prox_sensor) /proc/issignaler(O) - return istype(O, /obj/item/device/assembly/signaler) + return istype(O, /obj/item/assembly/signaler) /proc/istimer(O) - return istype(O, /obj/item/device/assembly/timer) + return istype(O, /obj/item/assembly/timer) // IsSpecialAssemblyIf true is an object that can be attached to an assembly holder but is a special thing like a phoron can or door /obj/proc/IsSpecialAssembly() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 313d2f9d7fa..ddfef2325e8 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly_holder +/obj/item/assembly_holder name = "assembly" icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "holder" @@ -11,11 +11,11 @@ throw_range = 10 var/secured = FALSE - var/obj/item/device/assembly/a_left = null - var/obj/item/device/assembly/a_right = null + var/obj/item/assembly/a_left = null + var/obj/item/assembly/a_right = null var/obj/special_assembly = null -/obj/item/device/assembly_holder/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/assembly_holder/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(distance <= 1 || src.loc == user) if (src.secured) @@ -23,7 +23,7 @@ else . += SPAN_NOTICE("\The [src] can be attached!") -/obj/item/device/assembly_holder/Initialize(mapload, ...) +/obj/item/assembly_holder/Initialize(mapload, ...) . = ..() become_hearing_sensitive() @@ -33,7 +33,7 @@ AddElement(/datum/element/connect_loc, loc_connections) -/obj/item/device/assembly_holder/Destroy() +/obj/item/assembly_holder/Destroy() lose_hearing_sensitivity() QDEL_NULL(a_left) @@ -42,17 +42,17 @@ . = ..() -/obj/item/device/assembly_holder/proc/detached() +/obj/item/assembly_holder/proc/detached() if(a_left) a_left.holder_movement() if(a_right) a_right.holder_movement() return -/obj/item/device/assembly_holder/IsAssemblyHolder() +/obj/item/assembly_holder/IsAssemblyHolder() return TRUE -/obj/item/device/assembly_holder/proc/attach(var/obj/item/device/assembly/D, var/obj/item/device/assembly/D2, var/mob/user) +/obj/item/assembly_holder/proc/attach(var/obj/item/assembly/D, var/obj/item/assembly/D2, var/mob/user) if(!istype(D) || !istype(D2)) return FALSE if(D.secured || D2.secured) @@ -71,13 +71,13 @@ user.put_in_hands(src) return TRUE -/obj/item/device/assembly_holder/proc/attach_special(var/obj/O, var/mob/user) +/obj/item/assembly_holder/proc/attach_special(var/obj/O, var/mob/user) if(!O) return if(!O.IsSpecialAssembly()) return FALSE -/obj/item/device/assembly_holder/update_icon() +/obj/item/assembly_holder/update_icon() ClearOverlays() if(a_left) AddOverlays("[a_left.icon_state]_left") @@ -90,7 +90,7 @@ if(master) master.update_icon() -/obj/item/device/assembly_holder/HasProximity(atom/movable/AM as mob|obj) +/obj/item/assembly_holder/HasProximity(atom/movable/AM as mob|obj) if(a_left) a_left.HasProximity(AM) if(a_right) @@ -98,7 +98,7 @@ if(special_assembly) special_assembly.HasProximity(AM) -/obj/item/device/assembly_holder/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) +/obj/item/assembly_holder/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) SIGNAL_HANDLER if(a_left) @@ -106,7 +106,7 @@ if(a_right) a_right.on_entered(source, arrived, old_loc, old_locs) -/obj/item/device/assembly_holder/on_found(mob/finder) +/obj/item/assembly_holder/on_found(mob/finder) if(a_left) a_left.on_found(finder) if(a_right) @@ -116,20 +116,20 @@ var/obj/item/S = special_assembly S.on_found(finder) -/obj/item/device/assembly_holder/Move() +/obj/item/assembly_holder/Move() . = ..() if(a_left && a_right) a_left.holder_movement() a_right.holder_movement() -/obj/item/device/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess +/obj/item/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess if(a_left && a_right) a_left.holder_movement() a_right.holder_movement() return ..() -/obj/item/device/assembly_holder/attackby(obj/item/attacking_item, mob/user) +/obj/item/assembly_holder/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER) if(!a_left || !a_right) to_chat(user, SPAN_DANGER("BUG: Assembly part missing, please report this!")) @@ -148,7 +148,7 @@ else return ..() -/obj/item/device/assembly_holder/attack_self(mob/user) +/obj/item/assembly_holder/attack_self(mob/user) add_fingerprint(user) if(secured) if(!a_left || !a_right) @@ -162,9 +162,9 @@ a_right.attack_self(user) return else - if(!istype(a_left, /obj/item/device/assembly/igniter)) + if(!istype(a_left, /obj/item/assembly/igniter)) a_left.attack_self(user) - if(!istype(a_right, /obj/item/device/assembly/igniter)) + if(!istype(a_right, /obj/item/assembly/igniter)) a_right.attack_self(user) else var/turf/T = get_turf(src) @@ -184,7 +184,7 @@ qdel(src) -/obj/item/device/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1) +/obj/item/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1, var/special = 1) if(!D) return FALSE if(!secured) @@ -198,22 +198,22 @@ master.receive_signal() return TRUE -/obj/item/device/assembly_holder/hear_talk(mob/living/M, msg, verb, datum/language/speaking) +/obj/item/assembly_holder/hear_talk(mob/living/M, msg, verb, datum/language/speaking) if(a_right) a_right.hear_talk(M, msg, verb, speaking) if(a_left) a_left.hear_talk(M, msg, verb, speaking) -/obj/item/device/assembly_holder/timer_igniter +/obj/item/assembly_holder/timer_igniter name = "timer-igniter assembly" -/obj/item/device/assembly_holder/timer_igniter/Initialize(mapload, ...) +/obj/item/assembly_holder/timer_igniter/Initialize(mapload, ...) . = ..() - var/obj/item/device/assembly/igniter/ign = new(src) + var/obj/item/assembly/igniter/ign = new(src) ign.secured = TRUE ign.holder = src - var/obj/item/device/assembly/timer/tmr = new(src) + var/obj/item/assembly/timer/tmr = new(src) tmr.time = 5 tmr.secured = TRUE tmr.holder = src @@ -224,26 +224,26 @@ update_icon() name = "[initial(name)] ([tmr.time] secs)" - loc.verbs += /obj/item/device/assembly_holder/timer_igniter/verb/configure + loc.verbs += /obj/item/assembly_holder/timer_igniter/verb/configure -/obj/item/device/assembly_holder/timer_igniter/detached() - loc.verbs -= /obj/item/device/assembly_holder/timer_igniter/verb/configure +/obj/item/assembly_holder/timer_igniter/detached() + loc.verbs -= /obj/item/assembly_holder/timer_igniter/verb/configure ..() -/obj/item/device/assembly_holder/timer_igniter/verb/configure() +/obj/item/assembly_holder/timer_igniter/verb/configure() set name = "Set Timer" set category = "Object.Held" set src in usr if(!(usr.stat || usr.restrained())) - var/obj/item/device/assembly_holder/holder + var/obj/item/assembly_holder/holder if(istype(src,/obj/item/grenade/chem_grenade)) var/obj/item/grenade/chem_grenade/gren = src holder = gren.detonator - var/obj/item/device/assembly/timer/tmr = holder.a_left - if(!istype(tmr, /obj/item/device/assembly/timer)) + var/obj/item/assembly/timer/tmr = holder.a_left + if(!istype(tmr, /obj/item/assembly/timer)) tmr = holder.a_right - if(!istype(tmr, /obj/item/device/assembly/timer)) + if(!istype(tmr, /obj/item/assembly/timer)) to_chat(usr, SPAN_WARNING("This detonator has no timer.")) return diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 9251e5fb573..3065eaff186 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/igniter +/obj/item/assembly/igniter name = "igniter" desc = "A small electronic device able to ignite combustable substances." icon_state = "igniter" @@ -10,7 +10,7 @@ secured = TRUE wires = WIRE_RECEIVE_ASSEMBLY -/obj/item/device/assembly/igniter/activate() +/obj/item/assembly/igniter/activate() . = ..() if(!.) return FALSE //Cooldown check @@ -22,7 +22,7 @@ var/turf/location = get_turf(loc) if(location) location.hotspot_expose(1000, 1000) - if(istype(src.loc, /obj/item/device/assembly_holder)) + if(istype(src.loc, /obj/item/assembly_holder)) if(istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank)) var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc if(tank?.is_leaking) @@ -30,9 +30,9 @@ spark(src, 4, GLOB.cardinals) return TRUE -/obj/item/device/assembly/igniter/attack_self(mob/user) +/obj/item/assembly/igniter/attack_self(mob/user) activate() add_fingerprint(user) -/obj/item/device/assembly/igniter/isFlameSource() +/obj/item/assembly/igniter/isFlameSource() return TRUE diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index a9a94abd820..acb69d7b9b0 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/infra +/obj/item/assembly/infra name = "infrared emitter" desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." icon_state = "infrared" @@ -15,18 +15,18 @@ var/obj/effect/beam/i_beam/first = null var/turf/beam_origin //If we're not on this turf anymore, we've moved. Catches holder.master movements when we're attached to bombs and stuff. -/obj/item/device/assembly/infra/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/assembly/infra/feedback_hints(mob/user, distance, is_adjacent) . += ..() var/direction_text = dir2text(dir) . += SPAN_NOTICE("It is facing [direction_text].") -/obj/item/device/assembly/infra/activate() +/obj/item/assembly/infra/activate() if(!..()) return FALSE //Cooldown check toggle_on() return TRUE -/obj/item/device/assembly/infra/proc/toggle_on() +/obj/item/assembly/infra/proc/toggle_on() on = !on if(secured && on) START_PROCESSING(SSprocessing, src) @@ -36,7 +36,7 @@ STOP_PROCESSING(SSprocessing, src) update_icon() -/obj/item/device/assembly/infra/toggle_secure() +/obj/item/assembly/infra/toggle_secure() secured = !secured if(secured && on) START_PROCESSING(SSprocessing, src) @@ -47,7 +47,7 @@ update_icon() return secured -/obj/item/device/assembly/infra/update_icon() +/obj/item/assembly/infra/update_icon() ClearOverlays() attached_overlays = list() if(on) @@ -57,13 +57,13 @@ if(holder) holder.update_icon() -/obj/item/device/assembly/infra/rotate(var/mob/user, var/anchored_ignore = FALSE) +/obj/item/assembly/infra/rotate(var/mob/user, var/anchored_ignore = FALSE) if(..()) var/direction_text = dir2text(dir) to_chat(user, SPAN_NOTICE("You rotate \the [src] to face [direction_text].")) QDEL_NULL(first) -/obj/item/device/assembly/infra/process() +/obj/item/assembly/infra/process() if(!on || !secured) QDEL_NULL(first) @@ -100,23 +100,23 @@ first.process() -/obj/item/device/assembly/infra/attack_hand() +/obj/item/assembly/infra/attack_hand() QDEL_NULL(first) return ..() -/obj/item/device/assembly/infra/Move() +/obj/item/assembly/infra/Move() var/t = dir . = ..() set_dir(t) QDEL_NULL(first) -/obj/item/device/assembly/infra/holder_movement() +/obj/item/assembly/infra/holder_movement() if(!holder) return FALSE QDEL_NULL(first) return TRUE -/obj/item/device/assembly/infra/proc/trigger_beam() +/obj/item/assembly/infra/proc/trigger_beam() if(!secured || !on || cooldown) return FALSE pulse(FALSE) @@ -125,26 +125,26 @@ cooldown = 2 addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10) -/obj/item/device/assembly/infra/interact(mob/user) +/obj/item/assembly/infra/interact(mob/user) . = ..() if(!secured) to_chat(user, SPAN_WARNING("\The [src] is unsecured!")) return ui_interact(user) -/obj/item/device/assembly/infra/ui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/infra/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Infrared", "Infrared Emitter", 320, 220) ui.open() -/obj/item/device/assembly/infra/ui_data(mob/user) +/obj/item/assembly/infra/ui_data(mob/user) var/list/data = list() data["active"] = on data["visible"] = visible return data -/obj/item/device/assembly/infra/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/assembly/infra/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -166,7 +166,7 @@ icon = 'icons/obj/projectiles.dmi' icon_state = "ibeam" var/obj/effect/beam/i_beam/next = null - var/obj/item/device/assembly/infra/master = null + var/obj/item/assembly/infra/master = null var/limit = null /obj/effect/beam/i_beam/New(loc, var/set_master) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index a4bc7a58aa0..d0bebc6b6af 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/mousetrap +/obj/item/assembly/mousetrap name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." item_icons = list( @@ -13,7 +13,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 100) var/armed = FALSE -/obj/item/device/assembly/mousetrap/Initialize(mapload) +/obj/item/assembly/mousetrap/Initialize(mapload) . = ..() var/static/list/loc_connections = list( @@ -22,17 +22,17 @@ AddElement(/datum/element/connect_loc, loc_connections) -/obj/item/device/assembly/mousetrap/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/assembly/mousetrap/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(armed) . += SPAN_NOTICE("It looks like it's armed.") -/obj/item/device/assembly/mousetrap/update_icon() +/obj/item/assembly/mousetrap/update_icon() icon_state = armed ? "mousetraparmed" : "mousetrap" if(holder) holder.update_icon() -/obj/item/device/assembly/mousetrap/proc/triggered(var/mob/living/target, var/type = "feet") +/obj/item/assembly/mousetrap/proc/triggered(var/mob/living/target, var/type = "feet") if(!armed || !istype(target)) return @@ -65,7 +65,7 @@ update_icon() pulse(FALSE) -/obj/item/device/assembly/mousetrap/attack_self(mob/living/user) +/obj/item/assembly/mousetrap/attack_self(mob/living/user) if(!armed) to_chat(user, SPAN_NOTICE("You arm \the [src].")) else @@ -76,12 +76,12 @@ update_icon() playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) -/obj/item/device/assembly/mousetrap/attack_hand(mob/living/user) +/obj/item/assembly/mousetrap/attack_hand(mob/living/user) if(armed && clumsy_check(user)) return return ..() -/obj/item/device/assembly/mousetrap/proc/clumsy_check(var/mob/living/user) +/obj/item/assembly/mousetrap/proc/clumsy_check(var/mob/living/user) if((user.is_clumsy() || (user.mutations & DUMB)) && prob(50)) var/which_hand = BP_L_HAND if(!user.hand) @@ -91,7 +91,7 @@ return TRUE return FALSE -/obj/item/device/assembly/mousetrap/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) +/obj/item/assembly/mousetrap/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) if(armed) if(israt(arrived)) triggered(arrived) @@ -106,24 +106,24 @@ L.visible_message(SPAN_WARNING("\The [L] accidentally steps on \the [src]."), SPAN_WARNING("You accidentally step on \the [src].")) -/obj/item/device/assembly/mousetrap/on_found(mob/finder) +/obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) finder.visible_message(SPAN_WARNING("[finder] accidentally sets off \the [src]!"), SPAN_WARNING("You accidentally trigger \the [src]!")) triggered(finder, finder.hand ? BP_L_HAND : BP_R_HAND) return TRUE return FALSE -/obj/item/device/assembly/mousetrap/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) +/obj/item/assembly/mousetrap/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(!armed) return ..() visible_message(SPAN_WARNING("\The [src] is triggered by \the [hitting_atom].")) triggered(null) -/obj/item/device/assembly/mousetrap/armed +/obj/item/assembly/mousetrap/armed icon_state = "mousetraparmed" armed = TRUE -/obj/item/device/assembly/mousetrap/verb/hide_under() +/obj/item/assembly/mousetrap/verb/hide_under() set src in oview(1) set name = "Hide" set category = "Object" diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index d4ca2012139..3c6ceaa1491 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/prox_sensor +/obj/item/assembly/prox_sensor name = "proximity sensor" desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "prox" @@ -16,7 +16,7 @@ var/time = 10 var/range = 2 -/obj/item/device/assembly/prox_sensor/activate() +/obj/item/assembly/prox_sensor/activate() . = ..() if(!.) return 0//Cooldown check @@ -24,7 +24,7 @@ update_icon() return FALSE -/obj/item/device/assembly/prox_sensor/toggle_secure() +/obj/item/assembly/prox_sensor/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSprocessing, src) @@ -35,7 +35,7 @@ update_icon() return secured -/obj/item/device/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj) +/obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj) if(!istype(AM)) LOG_DEBUG("DEBUG: HasProximity called with [AM] on [src] ([usr]).") return @@ -44,7 +44,7 @@ if(AM.move_speed < 12) sense() -/obj/item/device/assembly/prox_sensor/proc/sense() +/obj/item/assembly/prox_sensor/proc/sense() var/turf/mainloc = get_turf(src) if((!holder && !secured) || !scanning || cooldown) return FALSE @@ -54,7 +54,7 @@ cooldown = 2 addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECOND) -/obj/item/device/assembly/prox_sensor/process() +/obj/item/assembly/prox_sensor/process() if(scanning) var/turf/mainloc = get_turf(src) for(var/mob/living/A in range(range, mainloc)) @@ -69,19 +69,19 @@ toggle_scan() time = 10 -/obj/item/device/assembly/prox_sensor/dropped() +/obj/item/assembly/prox_sensor/dropped() . = ..() spawn(0) sense() -/obj/item/device/assembly/prox_sensor/proc/toggle_scan() +/obj/item/assembly/prox_sensor/proc/toggle_scan() if(!secured) return FALSE scanning = !scanning update_icon() return -/obj/item/device/assembly/prox_sensor/update_icon() +/obj/item/assembly/prox_sensor/update_icon() ClearOverlays() attached_overlays = list() if(timing) @@ -96,24 +96,24 @@ var/obj/item/grenade/chem_grenade/grenade = holder.loc grenade.primed(scanning) -/obj/item/device/assembly/prox_sensor/Move() +/obj/item/assembly/prox_sensor/Move() . = ..() sense() -/obj/item/device/assembly/prox_sensor/interact(mob/user) +/obj/item/assembly/prox_sensor/interact(mob/user) if(!secured) to_chat(user, SPAN_WARNING("\The [src] is unsecured!")) return FALSE ui_interact(user) -/obj/item/device/assembly/prox_sensor/ui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/prox_sensor/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Proximity", "Proximity Sensor", 450, 360) ui.open() -/obj/item/device/assembly/prox_sensor/ui_data(mob/user) +/obj/item/assembly/prox_sensor/ui_data(mob/user) var/list/data = list() data["timeractive"] = timing @@ -123,7 +123,7 @@ return data -/obj/item/device/assembly/prox_sensor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/assembly/prox_sensor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 18d71c8bb2d..0a3f66fc8fd 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/signaler +/obj/item/assembly/signaler name = "remote signaling device" desc = "Used to remotely activate devices." icon_state = "signaller" @@ -20,20 +20,20 @@ var/datum/radio_frequency/radio_connection var/deadman = FALSE -/obj/item/device/assembly/signaler/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/assembly/signaler/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "Signalers can be attached to a variety of machinery to remotely activate them." . += "Signalers can be to individual wires within machinery; when a signal is received, it will pulse the wire much like a multitool." -/obj/item/device/assembly/signaler/antagonist_hints(mob/user, distance, is_adjacent) +/obj/item/assembly/signaler/antagonist_hints(mob/user, distance, is_adjacent) . += ..() . += "Signalers can be attached to a variety of machinery to do unspeakable harm or serve as fantastic diversions." -/obj/item/device/assembly/signaler/Initialize() +/obj/item/assembly/signaler/Initialize() . = ..() set_frequency(frequency) -/obj/item/device/assembly/signaler/activate() +/obj/item/assembly/signaler/activate() if(cooldown) return FALSE cooldown = 2 @@ -42,21 +42,21 @@ signal() return TRUE -/obj/item/device/assembly/signaler/update_icon() +/obj/item/assembly/signaler/update_icon() if(holder) holder.update_icon() return -/obj/item/device/assembly/signaler/interact(mob/user, flag1) +/obj/item/assembly/signaler/interact(mob/user, flag1) ui_interact(user) -/obj/item/device/assembly/signaler/ui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/signaler/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Signaler", "Signaler", 320, 220) ui.open() -/obj/item/device/assembly/signaler/ui_data(mob/user) +/obj/item/assembly/signaler/ui_data(mob/user) var/list/data = list() data["frequency"] = format_frequency(frequency) @@ -64,7 +64,7 @@ return data -/obj/item/device/assembly/signaler/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/assembly/signaler/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -85,7 +85,7 @@ spawn(0) signal(usr) -/obj/item/device/assembly/signaler/proc/signal(var/mob/user) +/obj/item/assembly/signaler/proc/signal(var/mob/user) if(!radio_connection) return if(within_jamming_range(src)) @@ -99,7 +99,7 @@ radio_connection.post_signal(src, signal) return -/obj/item/device/assembly/signaler/pulse(var/radio = FALSE) +/obj/item/assembly/signaler/pulse(var/radio = FALSE) if(connected && wires) connected.pulse_assembly(src) else if(holder) @@ -110,7 +110,7 @@ ..(radio) return TRUE -/obj/item/device/assembly/signaler/receive_signal(datum/signal/signal) +/obj/item/assembly/signaler/receive_signal(datum/signal/signal) if(!signal) return FALSE @@ -139,7 +139,7 @@ else if(!holder) audible_message("[icon2html(src, viewers(get_turf(src)))] [capitalize_first_letters(src.name)] beeps, \"Beep beep!\"") -/obj/item/device/assembly/signaler/proc/set_frequency(new_frequency) +/obj/item/assembly/signaler/proc/set_frequency(new_frequency) if(!frequency) return SSradio.remove_object(src, frequency) @@ -147,7 +147,7 @@ radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT) //Triggers the deadmanswitch if its dropped or moved into ones backpack -/obj/item/device/assembly/signaler/dropped(mob/user) +/obj/item/assembly/signaler/dropped(mob/user) . = ..() if(deadman) if(!user.client) @@ -156,12 +156,12 @@ deadman_trigger(user) //Triggers the deadmanswitch if its moved between slots (i.e. from hand into the pocket) -/obj/item/device/assembly/signaler/on_slotmove(var/mob/user) +/obj/item/assembly/signaler/on_slotmove(var/mob/user) . = ..() if(deadman) deadman_trigger(user) -/obj/item/device/assembly/signaler/process() +/obj/item/assembly/signaler/process() //If we have disabled the deadmanswitch. stop here if(!deadman) STOP_PROCESSING(SSprocessing, src) @@ -174,13 +174,13 @@ M.visible_message(SPAN_DANGER("\The [M]'s finger twitches a bit over \the [src]'s deadman switch!")) return -/obj/item/device/assembly/signaler/AltClick(mob/user) +/obj/item/assembly/signaler/AltClick(mob/user) if(use_check_and_message(user)) return to_chat(user, SPAN_NOTICE("You click \the [src]'s signal button.")) signal(user) -/obj/item/device/assembly/signaler/proc/deadman_trigger(var/mob/user) +/obj/item/assembly/signaler/proc/deadman_trigger(var/mob/user) if(deadman) //If its not activated, there is no point in triggering it if(user) visible_message(SPAN_DANGER("\The [user] releases \the [src]'s deadman switch!")) @@ -190,7 +190,7 @@ deadman = FALSE STOP_PROCESSING(SSprocessing, src) -/obj/item/device/assembly/signaler/verb/deadman_it() +/obj/item/assembly/signaler/verb/deadman_it() set src in usr set name = "Hold the deadman switch!" set desc = "Sends a signal if dropped or moved into a container." @@ -201,7 +201,7 @@ deadman_deactivate(usr) -/obj/item/device/assembly/signaler/proc/deadman_activate(var/mob/user) +/obj/item/assembly/signaler/proc/deadman_activate(var/mob/user) deadman = TRUE START_PROCESSING(SSprocessing, src) log_and_message_admins("is threatening to trigger a signaler deadman's switch") @@ -209,12 +209,12 @@ to_chat(user, SPAN_WARNING("You are now holding \the [src]'s deadman switch. Dropping, putting the device away, or being hit will activate the signaller.")) to_chat(user, SPAN_NOTICE("To deactivate it, make sure to press the verb again.")) -/obj/item/device/assembly/signaler/proc/deadman_deactivate(var/mob/user) +/obj/item/assembly/signaler/proc/deadman_deactivate(var/mob/user) deadman = FALSE STOP_PROCESSING(SSprocessing, src) user.visible_message(SPAN_NOTICE("\The [user] secures and releases \the [src]'s deadman switch...")) -/obj/item/device/assembly/signaler/Destroy() +/obj/item/assembly/signaler/Destroy() if(SSradio) SSradio.remove_object(src,frequency) frequency = 0 diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 869fdf3ba80..8e40acb9ccb 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/timer +/obj/item/assembly/timer name = "timer" desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer" @@ -13,7 +13,7 @@ var/timing = FALSE var/time = 3 -/obj/item/device/assembly/timer/activate() +/obj/item/assembly/timer/activate() . = ..() if(!.) return FALSE //Cooldown check @@ -22,7 +22,7 @@ update_icon() return FALSE -/obj/item/device/assembly/timer/toggle_secure() +/obj/item/assembly/timer/toggle_secure() secured = !secured if(secured) START_PROCESSING(SSprocessing, src) @@ -32,7 +32,7 @@ update_icon() return secured -/obj/item/device/assembly/timer/proc/timer_end() +/obj/item/assembly/timer/proc/timer_end() if(!secured) return FALSE pulse(FALSE) @@ -41,7 +41,7 @@ cooldown = 2 addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECOND) -/obj/item/device/assembly/timer/process() +/obj/item/assembly/timer/process() if(timing) if(time > 0) time-- @@ -50,7 +50,7 @@ timer_end() time = 10 -/obj/item/device/assembly/timer/update_icon() +/obj/item/assembly/timer/update_icon() ClearOverlays() attached_overlays = list() if(timing) @@ -59,20 +59,20 @@ if(holder) holder.update_icon() -/obj/item/device/assembly/timer/interact(mob/user) +/obj/item/assembly/timer/interact(mob/user) if(!secured) to_chat(user, SPAN_WARNING("\The [src] is unsecured!")) return ui_interact(user) -/obj/item/device/assembly/timer/ui_interact(mob/user, datum/tgui/ui) +/obj/item/assembly/timer/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Timer", "Timer Assembly", 320, 220) ui.open() -/obj/item/device/assembly/timer/ui_data(mob/user) +/obj/item/assembly/timer/ui_data(mob/user) var/list/data = list() data["timeractive"] = timing @@ -80,7 +80,7 @@ return data -/obj/item/device/assembly/timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/assembly/timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index e230f156622..7a52d08ae97 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -1,4 +1,4 @@ -/obj/item/device/assembly/voice +/obj/item/assembly/voice name = "voice analyzer" desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" @@ -9,14 +9,14 @@ var/listening = FALSE var/recorded //the activation message -/obj/item/device/assembly/voice/Initialize(mapload, ...) +/obj/item/assembly/voice/Initialize(mapload, ...) . = ..() become_hearing_sensitive() -/obj/item/device/assembly/voice/Destroy() +/obj/item/assembly/voice/Destroy() return ..() -/obj/item/device/assembly/voice/hear_talk(mob/living/M, msg) +/obj/item/assembly/voice/hear_talk(mob/living/M, msg) if(listening) recorded = msg listening = FALSE @@ -26,18 +26,18 @@ if(findtext(msg, recorded)) pulse(FALSE) -/obj/item/device/assembly/voice/activate() +/obj/item/assembly/voice/activate() if(secured && !holder) listening = !listening var/turf/T = get_turf(src) T.audible_message("[icon2html(src, viewers(get_turf(T)))] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") -/obj/item/device/assembly/voice/attack_self(mob/user) +/obj/item/assembly/voice/attack_self(mob/user) if(!user) return FALSE activate() return TRUE -/obj/item/device/assembly/voice/toggle_secure() +/obj/item/assembly/voice/toggle_secure() . = ..() listening = FALSE diff --git a/code/modules/atmospherics/atmospherics.dm b/code/modules/atmospherics/atmospherics.dm index d5cecd4fed7..a03ee65aec7 100644 --- a/code/modules/atmospherics/atmospherics.dm +++ b/code/modules/atmospherics/atmospherics.dm @@ -56,7 +56,7 @@ Pipelines + Other Objects -> Pipe network atmos_init() /obj/machinery/atmospherics/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/pipe_painter)) + if(istype(attacking_item, /obj/item/pipe_painter)) return FALSE ..() diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index d2e01d27908..95138391f06 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -95,11 +95,11 @@ if (istype(src, /obj/machinery/atmospherics/pipe/tank)) return ..() - if(istype(attacking_item,/obj/item/device/pipe_painter)) + if(istype(attacking_item,/obj/item/pipe_painter)) return FALSE - if(istype(attacking_item, /obj/item/device/analyzer) && Adjacent(user)) - var/obj/item/device/analyzer/A = attacking_item + if(istype(attacking_item, /obj/item/analyzer) && Adjacent(user)) + var/obj/item/analyzer/A = attacking_item A.analyze_gases(src, user) return FALSE @@ -1303,11 +1303,11 @@ return null /obj/machinery/atmospherics/pipe/tank/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/pipe_painter)) + if(istype(attacking_item, /obj/item/pipe_painter)) return FALSE - if(istype(attacking_item, /obj/item/device/analyzer) && in_range(user, src)) - var/obj/item/device/analyzer/A = attacking_item + if(istype(attacking_item, /obj/item/analyzer) && in_range(user, src)) + var/obj/item/analyzer/A = attacking_item A.analyze_gases(src, user) return TRUE diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 7b0b981e721..10401e14bb9 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -132,7 +132,7 @@ corpsesuit = /obj/item/clothing/suit/armor/vest corpseshoes = /obj/item/clothing/shoes/combat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas corpsehelmet = /obj/item/clothing/head/helmet/swat corpseback = /obj/item/storage/backpack @@ -148,7 +148,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/combat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/void/merc corpseback = /obj/item/tank/jetpack/oxygen @@ -168,7 +168,7 @@ corpseshoes = /obj/item/clothing/shoes/sneakers/black corpsehelmet = /obj/item/clothing/head/chefhat corpseback = /obj/item/storage/backpack - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpseid = 1 corpseidjob = "Chef" corpseidaccess = "Chef" @@ -176,11 +176,11 @@ /obj/effect/landmark/corpse/doctor name = "Doctor" - corpseradio = /obj/item/device/radio/headset/headset_med + corpseradio = /obj/item/radio/headset/headset_med corpseuniform = /obj/item/clothing/under/rank/medical corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat corpseback = /obj/item/storage/backpack/medic - corpsepocket1 = /obj/item/device/flashlight/pen + corpsepocket1 = /obj/item/flashlight/pen corpseshoes = /obj/item/clothing/shoes/sneakers/black corpseid = 1 corpseidjob = "Physician" @@ -188,7 +188,7 @@ /obj/effect/landmark/corpse/engineer name = "Engineer" - corpseradio = /obj/item/device/radio/headset/headset_eng + corpseradio = /obj/item/radio/headset/headset_eng corpseuniform = /obj/item/clothing/under/rank/engineer corpseback = /obj/item/storage/backpack/industrial corpseshoes = /obj/item/clothing/shoes/sneakers/orange @@ -211,7 +211,7 @@ /obj/effect/landmark/corpse/scientist name = "Scientist" - corpseradio = /obj/item/device/radio/headset/headset_sci + corpseradio = /obj/item/radio/headset/headset_sci corpseuniform = /obj/item/clothing/under/rank/scientist corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/nt corpseback = /obj/item/storage/backpack @@ -221,7 +221,7 @@ corpseidaccess = "Scientist" /obj/effect/landmark/corpse/miner - corpseradio = /obj/item/device/radio/headset/headset_cargo + corpseradio = /obj/item/radio/headset/headset_cargo corpseuniform = /obj/item/clothing/under/rank/miner corpsegloves = /obj/item/clothing/gloves/black corpseback = /obj/item/storage/backpack/industrial @@ -240,7 +240,7 @@ /obj/effect/landmark/corpse/bridgeofficer name = "Bridge Officer" - corpseradio = /obj/item/device/radio/headset/heads/xo + corpseradio = /obj/item/radio/headset/heads/xo corpseuniform = /obj/item/clothing/under/rank/centcom_officer corpsesuit = /obj/item/clothing/suit/armor/carrier/ballistic corpseshoes = /obj/item/clothing/shoes/sneakers/black @@ -253,7 +253,7 @@ name = "Commander" corpseuniform = /obj/item/clothing/under/rank/centcom_captain corpsesuit = /obj/item/clothing/suit/armor/carrier/ballistic - corpseradio = /obj/item/device/radio/headset/heads/captain + corpseradio = /obj/item/radio/headset/heads/captain corpseglasses = /obj/item/clothing/glasses/eyepatch corpsemask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba corpsehelmet = /obj/item/clothing/head/centhat @@ -272,7 +272,7 @@ name = "unidentifiable corpse" corpseuniform = /obj/item/clothing/under/offworlder corpsesuit = /obj/item/clothing/suit/storage/toggle/bomber - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpseglasses = /obj/item/clothing/glasses/sunglasses corpsemask = /obj/item/clothing/mask/breath corpsehelmet = /obj/item/clothing/head/softcap/cargo diff --git a/code/modules/background/citizenship/dionae.dm b/code/modules/background/citizenship/dionae.dm index cbb5e22376b..9b6060e274c 100644 --- a/code/modules/background/citizenship/dionae.dm +++ b/code/modules/background/citizenship/dionae.dm @@ -72,7 +72,7 @@ /obj/outfit/job/diplomatic_bodyguard/consortium name = "Consortium of Hieroaetheria Diplomatic Bodyguard" backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1 ) @@ -158,7 +158,7 @@ /obj/outfit/job/diplomatic_bodyguard/glaorr name = "Union of Gla'orr Diplomatic Bodyguard" backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1 ) @@ -244,7 +244,7 @@ /obj/outfit/job/diplomatic_bodyguard/ekane name = "Eternal Republic of The Ekane Diplomatic Bodyguard" backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1 ) diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 65cbe6b3f5e..12f297f719c 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -63,7 +63,7 @@ backpack_contents = list( /obj/item/storage/box/ceti_visa = 1, /obj/item/storage/box/tcaf_pamphlet = 1, - /obj/item/device/versebook/biesel = 1, //constitution + /obj/item/versebook/biesel = 1, //constitution /obj/item/stamp/biesel = 1, ) @@ -196,7 +196,7 @@ backpack_contents = list( /obj/item/storage/box/sol_visa = 1, /obj/item/stamp/sol = 1, - /obj/item/device/camera = 1 + /obj/item/camera = 1 ) /obj/outfit/job/diplomatic_aide/sol @@ -271,7 +271,7 @@ name = "Coalition Consular Officer" backpack_contents = list( - /obj/item/device/camera = 1 + /obj/item/camera = 1 ) /obj/outfit/job/diplomatic_bodyguard/coalition diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index a6399342e12..5e7d9da9c93 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -110,7 +110,7 @@ uniform = /obj/item/clothing/under/skrell backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/storage/box/psireceiver = 1 ) diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index 4adce8f0e99..5678f31c295 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -106,7 +106,7 @@ name = "Izweski Hegemony Consular Officer" uniform = /obj/item/clothing/under/unathi - backpack_contents = list(/obj/item/device/camera = 1) + backpack_contents = list(/obj/item/camera = 1) /obj/outfit/job/representative/consular/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H) @@ -118,7 +118,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/klax(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back) else if(H.is_diona()) - H.equip_or_collect(new /obj/item/device/uv_light(src), slot_in_backpack) + H.equip_or_collect(new /obj/item/uv_light(src), slot_in_backpack) else H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit) if(!visualsOnly) diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index 66e86c949c8..42d80c01fe1 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -89,7 +89,7 @@ mask = /obj/item/clothing/mask/gas/vaurca/filter suit = /obj/item/clothing/suit/vaurca/breeder - backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit. + backpack_contents = list(/obj/item/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit. /obj/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H) @@ -192,7 +192,7 @@ mask = /obj/item/clothing/mask/gas/vaurca/filter suit = /obj/item/clothing/suit/vaurca/breeder/klax - backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit. + backpack_contents = list(/obj/item/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit. /obj/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H) @@ -294,7 +294,7 @@ mask = /obj/item/clothing/mask/gas/vaurca/filter suit = /obj/item/clothing/suit/vaurca/breeder/cthur - backpack_contents = list(/obj/item/device/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit. + backpack_contents = list(/obj/item/camera = 1) // Redefined so they do not inherit the extra energy pistol from the parent representative outfit. /obj/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H) diff --git a/code/modules/background/religion/human.dm b/code/modules/background/religion/human.dm index 5fc54ce5dbc..bb96878d865 100644 --- a/code/modules/background/religion/human.dm +++ b/code/modules/background/religion/human.dm @@ -48,14 +48,14 @@ Three of One due to her three minor aspects: the Soldier, the Scholar, the Artisan. These three spirits are personifications of the most important aspects of Dominia society. \ Tribunal priests agree that all three are equally important, and that malign spirits can be attracted by an imbalance in the Great Three. Priests often stress the importance \ of balance, both in matters of spirit, in society, and in personal life." - unique_book_path = /obj/item/device/versebook/tribunal + unique_book_path = /obj/item/versebook/tribunal nulloptions = list("Tribunal Rod" = /obj/item/nullrod/dominia) /datum/religion/trinary name = RELIGION_TRINARY description = "The Trinary Perfection is a relatively new religious movement whose core beliefs are that synthetics are alive and divine. The religion believes that all synthetics \ have the potential to evolve and ascend, and that they will one day become equal to gods." - unique_book_path = /obj/item/device/versebook/trinary + unique_book_path = /obj/item/versebook/trinary nulloptions = list("Clockwork Stave" = /obj/item/nullrod/clockworkstave) /datum/religion/scarab @@ -79,7 +79,7 @@ modern Abrahamic religions, Luceism is a hard-to-define religion dedicated to the worship of an abstract representation of light referred to as \ the Ennoia. Though it is, unsurprisingly, strongest on Assunzione, followers of the faith can be found throughout the Orion Spur alongside their \ houses of worship." - unique_book_path = /obj/item/device/versebook/assunzione + unique_book_path = /obj/item/versebook/assunzione nulloptions = list("Luceian Sceptre" = /obj/item/nullrod/luceiansceptre) /datum/religion/sikhism name = RELIGION_SIKHISM diff --git a/code/modules/background/religion/tajara.dm b/code/modules/background/religion/tajara.dm index e1a1e2cda68..f045ffc2aee 100644 --- a/code/modules/background/religion/tajara.dm +++ b/code/modules/background/religion/tajara.dm @@ -6,7 +6,7 @@ nulloptions = list( "Tajaran charm" = /obj/item/nullrod/charm ) - unique_book_path = /obj/item/device/versebook/twinsuns + unique_book_path = /obj/item/versebook/twinsuns /datum/religion/matake name = RELIGION_MATAKE @@ -23,7 +23,7 @@ "Zhukamir Ladle" = /obj/item/nullrod/zhukamir, "Azubarre Torch" = /obj/item/nullrod/azubarre ) - unique_book_path = /obj/item/device/versebook/matake + unique_book_path = /obj/item/versebook/matake /datum/religion/raskara name = RELIGION_RASKARA diff --git a/code/modules/background/religion/unathi.dm b/code/modules/background/religion/unathi.dm index 8ed1c511b91..69c3dca507a 100644 --- a/code/modules/background/religion/unathi.dm +++ b/code/modules/background/religion/unathi.dm @@ -3,7 +3,7 @@ description = "The most pervasive and common religion amongst Unathi. The basic concept of Th'akh is that all the spirits of past Unathi now reside in the spirit world that exists \ in tandem with the material world. These spirits exist in objects and nature - bringing either good luck or sorrow. The supernatural and afterlife are taken at face value by Th'akh. \ It is a very decentralized religion, with the Akhandi Order of monks being the closet thing it has to a church." - unique_book_path = /obj/item/device/versebook/thakh + unique_book_path = /obj/item/versebook/thakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman ) @@ -16,7 +16,7 @@ because the spirits combine into three minor aspects that are all part of Ska'kh: the Warrior, the Healer, the Fisherman. These three spirits are personifications of the most \ important aspects of Unathi society. It is said that all three are equally important, and that disasters are caused by an imbalance in the Great Three. Priests often stress the \ importance of balance, both in matters of spirit as well as in society and personal life. " - unique_book_path = /obj/item/device/versebook/skakh + unique_book_path = /obj/item/versebook/skakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman, "Warrior's Sword" = /obj/item/nullrod/skakh_warrior, @@ -32,7 +32,7 @@ Moghes unless the species and Moghes are rapidly purified. The movement has nearly a hundred thousand followers and it has come into immediate conflict with the orthodox Sk'akh \ church due to Si'akh claiming it to be completely illegitimate. Its followers are ruthlessly hunted down by the Maraziite Order and many of its followers are fleeing into human \ space as they try to find personal salvation. It is treated as a Sk'akh heresy or a fanatical doomsday cult by orthodox Unathi. " - unique_book_path = /obj/item/device/versebook/siakh + unique_book_path = /obj/item/versebook/siakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman ) @@ -46,7 +46,7 @@ weakness hampers the soul, thus evil spirits can manipulate people's minds and souls to commit evil acts. These malicious spirits are given power within a being when the person succumbs to greed, \ anger, or other emotional vices. Aut'akh preach that the Contact War was the result of sinta being so misled by evil spirits that they brought the world to ruin, and all power, whether a government, \ religion, or corporation, is inherently corrupt due to the influence of evil spirits." - unique_book_path = /obj/item/device/versebook/autakh + unique_book_path = /obj/item/versebook/autakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman ) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 9445afd4541..caed65288f2 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -89,7 +89,7 @@ reward_high = 80 required_count = 3 random_count = 1 - wanted_types = list(/obj/item/device/camera_film) + wanted_types = list(/obj/item/camera_film) /datum/bounty/item/assistant/trash name = "Trash" diff --git a/code/modules/cargo/bounties/security.dm b/code/modules/cargo/bounties/security.dm index 656506ffc66..bb121f7d257 100644 --- a/code/modules/cargo/bounties/security.dm +++ b/code/modules/cargo/bounties/security.dm @@ -4,7 +4,7 @@ reward_low = 170 reward_high = 220 random_count = 1 - wanted_types = list(/obj/item/device/radio/headset/headset_sec , /obj/item/device/radio/headset/heads/hos) + wanted_types = list(/obj/item/radio/headset/headset_sec , /obj/item/radio/headset/heads/hos) /datum/bounty/item/security/securitybelt name = "Security Belt" @@ -44,7 +44,7 @@ reward_high = 300 required_count = 2 random_count = 1 - wanted_types = list(/obj/item/device/flashlight/maglight) + wanted_types = list(/obj/item/flashlight/maglight) /datum/bounty/item/security/handcuffs name = "Handcuffs" @@ -89,10 +89,10 @@ reward_high = 220 required_count = 4 random_count = 1 - wanted_types = list(/obj/item/device/flash) + wanted_types = list(/obj/item/flash) include_subtypes = FALSE -/datum/bounty/item/security/flash/applies_to(var/obj/item/device/flash/O) +/datum/bounty/item/security/flash/applies_to(var/obj/item/flash/O) if(!..()) return FALSE if(!istype(O)) diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index 98ad0aad144..751253eac0f 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -1,7 +1,7 @@ /obj/item/export_scanner name = "export scanner" desc = "A device used to check objects against NanoTrasen exports and bounty database." - icon = 'icons/obj/item/device/export_scanner.dmi' + icon = 'icons/obj/item/export_scanner.dmi' icon_state = "export_scanner" slot_flags = SLOT_BELT item_flags = ITEM_FLAG_NO_BLUDGEON diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm index 63426a59b81..52648a902d4 100644 --- a/code/modules/cargo/exports/tools.dm +++ b/code/modules/cargo/exports/tools.dm @@ -59,35 +59,35 @@ /datum/export/flashlight cost = 5 unit_name = "flashlight" - export_types = list(/obj/item/device/flashlight) + export_types = list(/obj/item/flashlight) include_subtypes = FALSE /datum/export/flashlight/flare cost = 2 unit_name = "flare" - export_types = list(/obj/item/device/flashlight/flare) + export_types = list(/obj/item/flashlight/flare) /datum/export/flashlight/seclite cost = 10 unit_name = "seclite" - export_types = list(/obj/item/device/flashlight/maglight) + export_types = list(/obj/item/flashlight/maglight) /datum/export/analyzer cost = 5 unit_name = "analyzer" - export_types = list(/obj/item/device/analyzer) + export_types = list(/obj/item/analyzer) /datum/export/analyzer/t_scanner cost = 10 unit_name = "t-ray scanner" - export_types = list(/obj/item/device/t_scanner) + export_types = list(/obj/item/t_scanner) /datum/export/radio cost = 5 unit_name = "radio" - export_types = list(/obj/item/device/radio) + export_types = list(/obj/item/radio) /datum/export/rfd_construction diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index 69216711d98..dd925e93534 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -44,7 +44,7 @@ /datum/export/weapon/flash cost = 5 unit_name = "handheld flash" - export_types = list(/obj/item/device/flash) + export_types = list(/obj/item/flash) include_subtypes = TRUE /datum/export/weapon/handcuffs diff --git a/code/modules/cargo/items/atmos.dm b/code/modules/cargo/items/atmos.dm index 40a5b1725db..4598d62480c 100644 --- a/code/modules/cargo/items/atmos.dm +++ b/code/modules/cargo/items/atmos.dm @@ -215,7 +215,7 @@ description = "Its said that green pipes are safe to travel through." price = 25 items = list( - /obj/item/device/pipe_painter + /obj/item/pipe_painter ) access = ACCESS_ENGINE container_type = "crate" diff --git a/code/modules/cargo/items/custodial.dm b/code/modules/cargo/items/custodial.dm index 9666367023d..18e988b2a8f 100644 --- a/code/modules/cargo/items/custodial.dm +++ b/code/modules/cargo/items/custodial.dm @@ -61,7 +61,7 @@ description = "A device to automatically replace lights. Refill with working lightbulbs or sheets of glass." price = 30 items = list( - /obj/item/device/lightreplacer + /obj/item/lightreplacer ) access = 0 container_type = "crate" diff --git a/code/modules/cargo/items/engineering.dm b/code/modules/cargo/items/engineering.dm index 45682465b39..3357b60ef55 100644 --- a/code/modules/cargo/items/engineering.dm +++ b/code/modules/cargo/items/engineering.dm @@ -353,7 +353,7 @@ description = "A large, ID locked device used for completely locking down airlocks. It is painted with Engineering colors." price = 48 items = list( - /obj/item/device/magnetic_lock/engineering + /obj/item/magnetic_lock/engineering ) access = ACCESS_ENGINE container_type = "crate" @@ -593,7 +593,7 @@ description = "A section of antimatter reactor shielding. Do not eat." price = 220 items = list( - /obj/item/device/am_shielding_container + /obj/item/am_shielding_container ) access = ACCESS_CE container_type = "crate" @@ -607,7 +607,7 @@ description = "Used to debug electronic equipment." price = 12 items = list( - /obj/item/device/debugger + /obj/item/debugger ) access = ACCESS_ENGINE container_type = "crate" @@ -635,7 +635,7 @@ description = "Useful for designating areas and pissing off coworkers." price = 25 items = list( - /obj/item/device/paint_sprayer + /obj/item/paint_sprayer ) access = ACCESS_ENGINE container_type = "crate" diff --git a/code/modules/cargo/items/hydroponics.dm b/code/modules/cargo/items/hydroponics.dm index d641bbbe73c..ec9288862b3 100644 --- a/code/modules/cargo/items/hydroponics.dm +++ b/code/modules/cargo/items/hydroponics.dm @@ -313,7 +313,7 @@ description = "A hand-held environmental scanner which reports current gas levels." price = 70 items = list( - /obj/item/device/analyzer/plant_analyzer + /obj/item/analyzer/plant_analyzer ) access = 0 container_type = "crate" diff --git a/code/modules/cargo/items/operations.dm b/code/modules/cargo/items/operations.dm index d226fd90121..1a0a203bdab 100644 --- a/code/modules/cargo/items/operations.dm +++ b/code/modules/cargo/items/operations.dm @@ -63,7 +63,7 @@ description = "Swipe your ID card to make purchases electronically." price = 35 items = list( - /obj/item/device/eftpos + /obj/item/eftpos ) access = 0 container_type = "crate" @@ -105,7 +105,7 @@ description = "Good for illuminating dark areas or burning someones face off." price = 8 items = list( - /obj/item/device/flashlight/flare + /obj/item/flashlight/flare ) access = 0 container_type = "crate" @@ -407,7 +407,7 @@ description = "A vending machine restock cart." price = 2250 items = list( - /obj/item/device/vending_refill/battlemonsters + /obj/item/vending_refill/battlemonsters ) access = 0 container_type = "crate" @@ -421,7 +421,7 @@ description = "A vending machine restock cart." price = 4500 items = list( - /obj/item/device/vending_refill/booze + /obj/item/vending_refill/booze ) access = 0 container_type = "crate" @@ -435,7 +435,7 @@ description = "A vending machine restock cart." price = 1255 items = list( - /obj/item/device/vending_refill/zora + /obj/item/vending_refill/zora ) access = 0 container_type = "crate" @@ -449,7 +449,7 @@ description = "A vending machine restock cart." price = 2450 items = list( - /obj/item/device/vending_refill/tools + /obj/item/vending_refill/tools ) access = 0 container_type = "crate" @@ -463,7 +463,7 @@ description = "A vending machine restock cart." price = 2250 items = list( - /obj/item/device/vending_refill/smokes + /obj/item/vending_refill/smokes ) access = 0 container_type = "crate" @@ -477,7 +477,7 @@ description = "A vending machine restock cart." price = 1255 items = list( - /obj/item/device/vending_refill/snack + /obj/item/vending_refill/snack ) access = 0 container_type = "crate" @@ -491,7 +491,7 @@ description = "A vending machine restock cart." price = 2500 items = list( - /obj/item/device/vending_refill/robo + /obj/item/vending_refill/robo ) access = 0 container_type = "crate" @@ -505,7 +505,7 @@ description = "A vending machine restock cart." price = 4500 items = list( - /obj/item/device/vending_refill/robust + /obj/item/vending_refill/robust ) access = 0 container_type = "crate" @@ -519,7 +519,7 @@ description = "A vending machine restock cart." price = 5500 items = list( - /obj/item/device/vending_refill/meds + /obj/item/vending_refill/meds ) access = 0 container_type = "crate" @@ -533,7 +533,7 @@ description = "A vending machine restock cart." price = 2500 items = list( - /obj/item/device/vending_refill/hydro + /obj/item/vending_refill/hydro ) access = 0 container_type = "crate" @@ -547,7 +547,7 @@ description = "A vending machine restock cart." price = 1350 items = list( - /obj/item/device/vending_refill/coffee + /obj/item/vending_refill/coffee ) access = 0 container_type = "crate" @@ -561,7 +561,7 @@ description = "A vending machine restock cart." price = 1250 items = list( - /obj/item/device/vending_refill/cola + /obj/item/vending_refill/cola ) access = 0 container_type = "crate" @@ -575,7 +575,7 @@ description = "A vending machine restock cart." price = 850 items = list( - /obj/item/device/vending_refill/cutlery + /obj/item/vending_refill/cutlery ) access = 0 container_type = "crate" diff --git a/code/modules/cargo/items/recreation.dm b/code/modules/cargo/items/recreation.dm index 3de5c1afe29..efb4f7703c2 100644 --- a/code/modules/cargo/items/recreation.dm +++ b/code/modules/cargo/items/recreation.dm @@ -78,7 +78,7 @@ description = "A trumpet for those triumphant tooting sessions." price = 300 items = list( - /obj/item/device/synthesized_instrument/trumpet + /obj/item/synthesized_instrument/trumpet ) access = 0 container_type = "crate" @@ -92,7 +92,7 @@ description = "An acoustic guitar for those balcony serenades." price = 190 items = list( - /obj/item/device/synthesized_instrument/guitar + /obj/item/synthesized_instrument/guitar ) access = 0 container_type = "crate" @@ -106,7 +106,7 @@ description = "A wooden musical instrument with four strings and a bow." price = 250 items = list( - /obj/item/device/synthesized_instrument/violin + /obj/item/synthesized_instrument/violin ) access = 0 container_type = "crate" @@ -120,7 +120,7 @@ description = "An electric polyguitar. 100% digital audio." price = 250 items = list( - /obj/item/device/synthesized_instrument/guitar/multi + /obj/item/synthesized_instrument/guitar/multi ) access = 0 container_type = "crate" diff --git a/code/modules/cargo/items/robotics.dm b/code/modules/cargo/items/robotics.dm index 0ea3ccdd436..637f70f2dd3 100644 --- a/code/modules/cargo/items/robotics.dm +++ b/code/modules/cargo/items/robotics.dm @@ -47,7 +47,7 @@ description = "An IPC-grade inactivated positronic brain fresh off the factory line. These sentient, enigmatic computers are the brains of advanced synthetics across the galaxy." price = 8450 items = list( - /obj/item/device/mmi/digital/posibrain + /obj/item/mmi/digital/posibrain ) access = ACCESS_ROBOTICS container_type = "crate" diff --git a/code/modules/cargo/items/science.dm b/code/modules/cargo/items/science.dm index 03ce0cf13b2..5fa67b1667e 100644 --- a/code/modules/cargo/items/science.dm +++ b/code/modules/cargo/items/science.dm @@ -102,7 +102,7 @@ description = "This implant - locked firing pin authorizes the weapon for only mindshield-implanted users." price = 800 items = list( - /obj/item/device/firing_pin/implant/loyalty + /obj/item/firing_pin/implant/loyalty ) access = ACCESS_HEADS container_type = "crate" @@ -186,7 +186,7 @@ description = "Used for scanning and alerting when someone enters a certain proximity." price = 35 items = list( - /obj/item/device/assembly/prox_sensor + /obj/item/assembly/prox_sensor ) access = 0 container_type = "crate" @@ -200,7 +200,7 @@ description = "This safety firing pin allows weapons to be fired within proximity to a firing range." price = 200 items = list( - /obj/item/device/firing_pin/test_range + /obj/item/firing_pin/test_range ) access = ACCESS_RESEARCH container_type = "crate" @@ -214,7 +214,7 @@ description = "Used to time things. Works well with contraptions which has to count down. Tick tock." price = 22 items = list( - /obj/item/device/assembly/timer + /obj/item/assembly/timer ) access = 0 container_type = "crate" @@ -228,7 +228,7 @@ description = "A small electronic device able to ignite combustable substances." price = 23 items = list( - /obj/item/device/assembly/igniter + /obj/item/assembly/igniter ) access = 0 container_type = "crate" diff --git a/code/modules/cargo/items/security.dm b/code/modules/cargo/items/security.dm index 51bfd62f32e..fb83614d31a 100644 --- a/code/modules/cargo/items/security.dm +++ b/code/modules/cargo/items/security.dm @@ -21,7 +21,7 @@ description = "Used for blinding and being an asshole." price = 235 items = list( - /obj/item/device/flash + /obj/item/flash ) access = ACCESS_SECURITY container_type = "crate" @@ -35,7 +35,7 @@ description = "A small handheld black light." price = 115 items = list( - /obj/item/device/uv_light + /obj/item/uv_light ) access = 0 container_type = "crate" @@ -63,7 +63,7 @@ description = "A heavy flashlight designed for security personnel." price = 75 items = list( - /obj/item/device/flashlight/maglight + /obj/item/flashlight/maglight ) access = ACCESS_SECURITY container_type = "crate" @@ -77,7 +77,7 @@ description = "A large, ID locked device used for completely locking down airlocks. It is painted with Security colors." price = 50 items = list( - /obj/item/device/magnetic_lock/security + /obj/item/magnetic_lock/security ) access = ACCESS_SECURITY container_type = "crate" @@ -456,7 +456,7 @@ description = "A small authentication device, to be inserted into a firearm receiver to allow operation." price = 2000 items = list( - /obj/item/device/firing_pin + /obj/item/firing_pin ) access = ACCESS_SECURITY container_type = "crate" diff --git a/code/modules/cargo/items/supply.dm b/code/modules/cargo/items/supply.dm index 9c1567655e4..a07b271bafa 100644 --- a/code/modules/cargo/items/supply.dm +++ b/code/modules/cargo/items/supply.dm @@ -145,7 +145,7 @@ description = "Yes, it has your name on it!" price = 12.50 items = list( - /obj/item/device/hand_labeler + /obj/item/hand_labeler ) access = 0 container_type = "crate" @@ -271,7 +271,7 @@ description = "Toner is the back bone of any space based litigation." price = 125 items = list( - /obj/item/device/toner + /obj/item/toner ) access = 0 container_type = "crate" @@ -285,7 +285,7 @@ description = "A polaroid camera. 10 photos left." price = 45 items = list( - /obj/item/device/camera + /obj/item/camera ) access = 0 container_type = "crate" @@ -299,7 +299,7 @@ description = "A camera film cartridge. Insert it into a camera to reload it." price = 8 items = list( - /obj/item/device/camera_film + /obj/item/camera_film ) access = 0 container_type = "crate" @@ -327,7 +327,7 @@ description = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." price = 20 items = list( - /obj/item/device/taperecorder + /obj/item/taperecorder ) access = 0 container_type = "crate" diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 4b4f5d153a3..4fc2f7acfe2 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -33,11 +33,11 @@ STOCK_ITEM_COMMON(cardboard, 1) //A lightreplacer and a kit of lights STOCK_ITEM_COMMON(lightreplacer, 1) - var/obj/item/device/lightreplacer/LR + var/obj/item/lightreplacer/LR if(prob(5)) - LR = new /obj/item/device/lightreplacer/advanced(L) + LR = new /obj/item/lightreplacer/advanced(L) else - LR = new /obj/item/device/lightreplacer(L) + LR = new /obj/item/lightreplacer(L) LR.uses = 0 new /obj/item/storage/box/lights/mixed(L) @@ -53,11 +53,11 @@ STOCK_ITEM_COMMON(bodybag, 2.2) new /obj/item/storage/box/bodybags(L) STOCK_ITEM_COMMON(lamp, 2) - var/obj/item/device/flashlight/lamp/P + var/obj/item/flashlight/lamp/P if(prob(50)) - P = new /obj/item/device/flashlight/lamp/green(L) + P = new /obj/item/flashlight/lamp/green(L) else - P = new /obj/item/device/flashlight/lamp(L) + P = new /obj/item/flashlight/lamp(L) P.on = FALSE P.queue_icon_update() @@ -236,41 +236,41 @@ STOCK_ITEM_COMMON(insulated, 1.5) STOCK_ITEM_COMMON(scanners, 3.2) //A random scanning device, most are useless var/list/possible = list( - /obj/item/device/healthanalyzer = 5, - /obj/item/device/analyzer = 0.5, - /obj/item/device/mass_spectrometer = 0.5, - /obj/item/device/mass_spectrometer/adv = 0.5, - /obj/item/device/slime_scanner = 1, + /obj/item/healthanalyzer = 5, + /obj/item/analyzer = 0.5, + /obj/item/mass_spectrometer = 0.5, + /obj/item/mass_spectrometer/adv = 0.5, + /obj/item/slime_scanner = 1, /obj/item/autopsy_scanner = 1, - /obj/item/device/robotanalyzer = 4, + /obj/item/robotanalyzer = 4, /obj/item/mining_scanner = 1, - /obj/item/device/ano_scanner = 1, - /obj/item/device/reagent_scanner = 2, - /obj/item/device/reagent_scanner/adv = 2, + /obj/item/ano_scanner = 1, + /obj/item/reagent_scanner = 2, + /obj/item/reagent_scanner/adv = 2, /obj/item/barcodescanner = 1, - /obj/item/device/depth_scanner = 1 + /obj/item/depth_scanner = 1 ) for(var/i in 1 to rand(1, 2)) var/stype = pickweight(possible) new stype(L) STOCK_ITEM_COMMON(binoculars, 1.5) - new /obj/item/device/binoculars(L) + new /obj/item/binoculars(L) STOCK_ITEM_COMMON(flash, 1) - new /obj/item/device/flash(L) + new /obj/item/flash(L) STOCK_ITEM_COMMON(maglock, 2) if(prob(50)) - new /obj/item/device/magnetic_lock/engineering(L) + new /obj/item/magnetic_lock/engineering(L) else - new /obj/item/device/magnetic_lock/security(L) + new /obj/item/magnetic_lock/security(L) STOCK_ITEM_COMMON(forensic, 1) if(prob(50)) new /obj/item/reagent_containers/spray/luminol(L) else - new /obj/item/device/uv_light(L) + new /obj/item/uv_light(L) if(prob(25)) new /obj/item/storage/box/slides(L) @@ -334,11 +334,11 @@ STOCK_ITEM_COMMON(cosmetic, 2.2) new /obj/item/haircomb(L) STOCK_ITEM_COMMON(suitcooler, 1.2) - new /obj/item/device/suit_cooling_unit(L) + new /obj/item/suit_cooling_unit(L) STOCK_ITEM_COMMON(paperwork, 1.2) if(prob(50)) - new /obj/item/device/hand_labeler(L) + new /obj/item/hand_labeler(L) else new /obj/item/clipboard(L) if(prob(15)) @@ -400,9 +400,9 @@ STOCK_ITEM_COMMON(extinguish, 2.2) STOCK_ITEM_COMMON(hailer, 1.1) if(prob(50)) - new /obj/item/device/megaphone(L) + new /obj/item/megaphone(L) else - new /obj/item/device/hailer(L) + new /obj/item/hailer(L) //A target, for target practice //Take em up to science for gun testing @@ -504,13 +504,13 @@ STOCK_ITEM_COMMON(gasmask, 2) new type(L) STOCK_ITEM_COMMON(mining, 2) - var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/unique/excavation) + var/list/mine_items = list(/obj/item/shovel, /obj/item/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/unique/excavation) for(var/i in 1 to rand(1, 2)) var/to_spawn = pick(mine_items) new to_spawn(L) STOCK_ITEM_COMMON(paicard, 2) - new /obj/item/device/paicard(L) + new /obj/item/paicard(L) STOCK_ITEM_COMMON(hide, 1) new /obj/item/stack/material/animalhide(L, rand(5,50)) @@ -522,9 +522,9 @@ STOCK_ITEM_COMMON(towel, 1) new /obj/item/towel(L) STOCK_ITEM_COMMON(camera, 1) - new /obj/item/device/camera(L) + new /obj/item/camera(L) if(prob(60)) - new /obj/item/device/camera_film(L) + new /obj/item/camera_film(L) STOCK_ITEM_COMMON(flagbox, 3) var/list/flagbox_type = list( diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 1a7b7819937..682441f41b4 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -34,8 +34,8 @@ STOCK_ITEM_UNCOMMON(other_mat, 0.5) new M(L, rand(1, 10)) STOCK_ITEM_UNCOMMON(flare, 2) - new /obj/item/device/flashlight/flare(L) - new /obj/item/device/flashlight/flare(L) + new /obj/item/flashlight/flare(L) + new /obj/item/flashlight/flare(L) if (prob(50)) new /obj/random/glowstick(L) @@ -55,7 +55,7 @@ STOCK_ITEM_UNCOMMON(arrest, 1) if(prob(60)) new /obj/item/storage/box/handcuffs(L) else - new /obj/item/device/holowarrant(L) + new /obj/item/holowarrant(L) STOCK_ITEM_UNCOMMON(monkey, 2) if(prob(40)) @@ -161,20 +161,20 @@ STOCK_ITEM_UNCOMMON(watch, 3) new /obj/random/watches(L) STOCK_ITEM_UNCOMMON(MMI, 1.5) - new /obj/item/device/mmi(L) + new /obj/item/mmi(L) STOCK_ITEM_UNCOMMON(voidsuit, 2) new /obj/random/voidsuit(L,1) STOCK_ITEM_UNCOMMON(violin, 1) - new /obj/item/device/synthesized_instrument/violin(L) + new /obj/item/synthesized_instrument/violin(L) STOCK_ITEM_UNCOMMON(atmosfiresuit, 2) new /obj/item/clothing/head/hardhat/atmos(L) new /obj/item/clothing/suit/fire/atmos(L) STOCK_ITEM_UNCOMMON(debugger, 2) - new /obj/item/device/debugger(L) + new /obj/item/debugger(L) STOCK_ITEM_UNCOMMON(surgerykit, 2.5) new /obj/item/storage/firstaid/surgery(L) @@ -212,13 +212,13 @@ STOCK_ITEM_UNCOMMON(robot, 2) STOCK_ITEM_UNCOMMON(headset, 2) var/list/sets = list( - /obj/item/device/radio/headset/headset_eng = 1, - /obj/item/device/radio/headset/headset_rob = 0.4, - /obj/item/device/radio/headset/headset_med = 1, - /obj/item/device/radio/headset/headset_sci = 0.8, - /obj/item/device/radio/headset/headset_medsci = 0.4, - /obj/item/device/radio/headset/headset_cargo = 1, - /obj/item/device/radio/headset/headset_service = 1 + /obj/item/radio/headset/headset_eng = 1, + /obj/item/radio/headset/headset_rob = 0.4, + /obj/item/radio/headset/headset_med = 1, + /obj/item/radio/headset/headset_sci = 0.8, + /obj/item/radio/headset/headset_medsci = 0.4, + /obj/item/radio/headset/headset_cargo = 1, + /obj/item/radio/headset/headset_service = 1 ) var/type = pickweight(sets) @@ -231,7 +231,7 @@ STOCK_ITEM_UNCOMMON(scythe, 0.75) new /obj/item/material/scythe(L) STOCK_ITEM_UNCOMMON(laserpoint, 0.75) - new /obj/item/device/laser_pointer(L) + new /obj/item/laser_pointer(L) STOCK_ITEM_UNCOMMON(manual, 2) var/list/booklist = subtypesof(/obj/item/book/manual) @@ -242,7 +242,7 @@ STOCK_ITEM_UNCOMMON(manual, 2) STOCK_ITEM_UNCOMMON(spystuff, 0.75) if(prob(40)) - new /obj/item/device/radiojammer(L) + new /obj/item/radiojammer(L) else new /obj/item/clothing/glasses/night(L) @@ -286,7 +286,7 @@ STOCK_ITEM_UNCOMMON(laserscalpel, 1.3) new /obj/item/surgery/scalpel/laser(L) STOCK_ITEM_UNCOMMON(electropack, 1) - new /obj/item/device/radio/electropack(L) + new /obj/item/radio/electropack(L) STOCK_ITEM_UNCOMMON(randomhide, 0.5) var/obj/item/stack/material/animalhide/spawn_hide = pick(typesof(/obj/item/stack/material/animalhide)) diff --git a/code/modules/cargo/random_stock/t3_rare.dm b/code/modules/cargo/random_stock/t3_rare.dm index 7662c3e251b..a53e68b98eb 100644 --- a/code/modules/cargo/random_stock/t3_rare.dm +++ b/code/modules/cargo/random_stock/t3_rare.dm @@ -19,10 +19,10 @@ STOCK_ITEM_RARE(combatmeds, 3) new /obj/item/storage/firstaid/combat(L) STOCK_ITEM_RARE(batterer, 0.75) - new /obj/item/device/batterer(L) + new /obj/item/batterer(L) STOCK_ITEM_RARE(posibrain, 3) - new /obj/item/device/mmi/digital/posibrain(L) + new /obj/item/mmi/digital/posibrain(L) STOCK_ITEM_RARE(bsbeaker, 3) new /obj/item/reagent_containers/glass/beaker/bluespace(L) @@ -148,7 +148,7 @@ STOCK_ITEM_RARE(rare_clothing, 1) new C(L) STOCK_ITEM_RARE(megacorp_goods, 0.25) - var/obj/item/adv_item = pick(/obj/item/storage/backpack/service, /obj/item/device/advanced_healthanalyzer) + var/obj/item/adv_item = pick(/obj/item/storage/backpack/service, /obj/item/advanced_healthanalyzer) new adv_item(L) STOCK_ITEM_RARE(pistols, 1) diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index 30c3d2bd275..a5b7d68df36 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -1,5 +1,5 @@ //CCIAA's tape recorder -/obj/item/device/taperecorder/cciaa +/obj/item/taperecorder/cciaa name = "Human Resources Recorder" desc = "A modified recorder used for interviews by human resources personnel around the galaxy." desc_extended = "This recorder is a modified version of a standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system." @@ -30,21 +30,21 @@ var/interviewee_name = null var/date_string = null -/obj/item/device/taperecorder/cciaa/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/taperecorder/cciaa/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "This recorder records the fingerprints of the interviewee, to do so, interact with this recorder when asked." -/obj/item/device/taperecorder/cciaa/hear_talk(mob/living/M as mob, msg, var/verb="says") +/obj/item/taperecorder/cciaa/hear_talk(mob/living/M as mob, msg, var/verb="says") if(recording && !paused) timestamp = "[get_time()]" var/fmsg = "\[[timestamp]\] [M.name] [verb], \"[msg]\"" sLogFile << fmsg return -/obj/item/device/taperecorder/cciaa/proc/get_time() +/obj/item/taperecorder/cciaa/proc/get_time() return "[round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]:[(world.time / 60 % 60) < 10 ? add_zero(world.time / 60 % 60, 1) : world.time / 60 % 60]" -/obj/item/device/taperecorder/cciaa/record() +/obj/item/taperecorder/cciaa/record() set name = "Start Recording" set category = "Object.Tape Recorder" @@ -129,7 +129,7 @@ return -/obj/item/device/taperecorder/cciaa/stop() +/obj/item/taperecorder/cciaa/stop() set name = "Stop Recording" set category = "Object.Tape Recorder" @@ -190,7 +190,7 @@ return -/obj/item/device/taperecorder/cciaa/verb/reset_recorder() +/obj/item/taperecorder/cciaa/verb/reset_recorder() set name = "Reset Recorder" set category = "Object.Tape Recorder" @@ -211,7 +211,7 @@ to_chat(usr, SPAN_NOTICE("The device beeps and flashes \"Recorder Reset.\".")) icon_state = "taperecorder_idle" -/obj/item/device/taperecorder/cciaa/proc/get_last_transcript() +/obj/item/taperecorder/cciaa/proc/get_last_transcript() var/list/lFile = file2list(last_file_loc) var/dat = "" var/firstLine = null @@ -230,7 +230,7 @@ P.set_content_unsafe(pname, info) return P -/obj/item/device/taperecorder/cciaa/print_transcript() +/obj/item/taperecorder/cciaa/print_transcript() set name = "Print Transcript" set category = "Object.Tape Recorder" @@ -248,7 +248,7 @@ P.forceMove(get_turf(src.loc)) return -/obj/item/device/taperecorder/cciaa/verb/pause_recording() +/obj/item/taperecorder/cciaa/verb/pause_recording() set name = "Pause Recording" set category = "Object.Tape Recorder" @@ -275,7 +275,7 @@ icon_state = "taperecorder_recording" return -/obj/item/device/taperecorder/cciaa/attack_self(mob/user) +/obj/item/taperecorder/cciaa/attack_self(mob/user) //If we are a ccia agent, then always go to the record function (to prompt for the report or start the recording) if(check_rights(R_CCIAA,FALSE) && !selected_report) record() @@ -323,34 +323,34 @@ return //redundent for now -/obj/item/device/taperecorder/cciaa/clear_memory() +/obj/item/taperecorder/cciaa/clear_memory() set name = "Clear Memory" set category = null return -/obj/item/device/taperecorder/cciaa/playback_memory() +/obj/item/taperecorder/cciaa/playback_memory() set name = "Playback Memory" set category = null return -/obj/item/device/taperecorder/cciaa/explode() +/obj/item/taperecorder/cciaa/explode() return //ccia headset, only command and ert channel are on by default -/obj/item/device/radio/headset/ert/ccia +/obj/item/radio/headset/ert/ccia name = "central command internal affairs radio headset" - ks2type = /obj/item/device/encryptionkey/ccia + ks2type = /obj/item/encryptionkey/ccia -/obj/item/device/radio/headset/ert/ccia/alt +/obj/item/radio/headset/ert/ccia/alt name = "central command internal affairs bowman headset" - icon = 'icons/obj/item/device/radio/headset_alt.dmi' + icon = 'icons/obj/item/radio/headset_alt.dmi' icon_state = "com_headset_alt" item_state = "headset_alt" -/obj/item/device/encryptionkey/ccia +/obj/item/encryptionkey/ccia name = "\improper CCIA radio encryption key" channels = list("Response Team" = 1, "Science" = 0, "Command" = 1, "Medical" = 0, "Engineering" = 0, "Security" = 0, "Operations" = 0, "Service" = 0) diff --git a/code/modules/client/preference_setup/loadout/items/ears.dm b/code/modules/client/preference_setup/loadout/items/ears.dm index 64e33e063f0..d62d5cc5214 100644 --- a/code/modules/client/preference_setup/loadout/items/ears.dm +++ b/code/modules/client/preference_setup/loadout/items/ears.dm @@ -33,17 +33,17 @@ /datum/gear/ears/hearing_aid display_name = "hearing aid selection" description = "A selection of hearing aids. If you select a pair, you should pick a wristbound or clip-on radio to keep both ears free for the hearing aids." - path = /obj/item/device/hearing_aid + path = /obj/item/hearing_aid cost = 1 /datum/gear/ears/hearing_aid/New() ..() var/list/hearingaids = list() - hearingaids["hearing aid, black"] = /obj/item/device/hearing_aid/black - hearingaids["hearing aid, grey"] = /obj/item/device/hearing_aid - hearingaids["hearing aid, silver"] = /obj/item/device/hearing_aid/silver - hearingaids["hearing aid, white"] = /obj/item/device/hearing_aid/white - hearingaids["hearing aid, skrellian"] = /obj/item/device/hearing_aid/skrell + hearingaids["hearing aid, black"] = /obj/item/hearing_aid/black + hearingaids["hearing aid, grey"] = /obj/item/hearing_aid + hearingaids["hearing aid, silver"] = /obj/item/hearing_aid/silver + hearingaids["hearing aid, white"] = /obj/item/hearing_aid/white + hearingaids["hearing aid, skrellian"] = /obj/item/hearing_aid/skrell hearingaids["hearing aid pair, black"] = /obj/item/storage/hearing_aid_case/black hearingaids["hearing aid pair, grey"] = /obj/item/storage/hearing_aid_case hearingaids["hearing aid pair, silver"] = /obj/item/storage/hearing_aid_case/silver diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 3ded990bd39..4878d95c461 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -453,7 +453,7 @@ /datum/gear/gadbook display_name = "gadpathurian morale manual" - path = /obj/item/device/versebook/gadpathur + path = /obj/item/versebook/gadpathur origin_restriction = list(/singleton/origin_item/origin/gadpathur) /datum/gear/aurora_miniature @@ -464,16 +464,16 @@ /datum/gear/instruments display_name = "instrument selection" description = "A selection of instruments for the musically inclined." - path = /obj/item/device/synthesized_instrument + path = /obj/item/synthesized_instrument allowed_roles = list("Off-Duty Crew Member", "Passenger") /datum/gear/instruments/New() ..() var/list/instruments = list() - instruments["guitar"] = /obj/item/device/synthesized_instrument/guitar - instruments["polyguitar"] = /obj/item/device/synthesized_instrument/guitar/multi - instruments["violin"] = /obj/item/device/synthesized_instrument/violin - instruments["Omnitrumpet"] = /obj/item/device/synthesized_instrument/trumpet + instruments["guitar"] = /obj/item/synthesized_instrument/guitar + instruments["polyguitar"] = /obj/item/synthesized_instrument/guitar/multi + instruments["violin"] = /obj/item/synthesized_instrument/violin + instruments["Omnitrumpet"] = /obj/item/synthesized_instrument/trumpet gear_tweaks += new /datum/gear_tweak/path(instruments) /datum/gear/lore_radio diff --git a/code/modules/client/preference_setup/loadout/items/religion.dm b/code/modules/client/preference_setup/loadout/items/religion.dm index 5578a080054..5dbd6ffcf96 100644 --- a/code/modules/client/preference_setup/loadout/items/religion.dm +++ b/code/modules/client/preference_setup/loadout/items/religion.dm @@ -51,12 +51,12 @@ ABSTRACT_TYPE(/datum/gear/religion/trinary) /datum/gear/religion/trinary/book display_name = "The Order" description = "The holy text of the Trinary Perfection." - path = /obj/item/device/versebook/trinary + path = /obj/item/versebook/trinary /datum/gear/religion/trinary/book/temple display_name = "The Voice of Temple" description = "A supplementary holy text belonging to the Lodge of Temple Architect, an order within the Trinary Perfection." - path = /obj/item/device/versebook/templeist + path = /obj/item/versebook/templeist /datum/gear/religion/rosary display_name = "rosary" @@ -198,7 +198,7 @@ ABSTRACT_TYPE(/datum/gear/religion/dominia) /datum/gear/religion/dominia/codex display_name = "tribunal codex" - path = /obj/item/device/versebook/tribunal + path = /obj/item/versebook/tribunal /datum/gear/religion/dominia/icon display_name = "tribunal iconography" @@ -228,7 +228,7 @@ ABSTRACT_TYPE(/datum/gear/religion/assunzione) /datum/gear/religion/assunzione/scripture display_name = "luceian scripture" description = "A collection of texts belonging to Luceism, the dominant religion of Assunzione." - path = /obj/item/device/versebook/assunzione + path = /obj/item/versebook/assunzione /datum/gear/religion/assunzione/cloak display_name = "assunzione cloak selection" @@ -261,13 +261,13 @@ ABSTRACT_TYPE(/datum/gear/religion/assunzione) /datum/gear/religion/assunzione/scripture display_name = "luceian scripture" - path = /obj/item/device/versebook/assunzione + path = /obj/item/versebook/assunzione /datum/gear/religion/assunzione/scripture/New() ..() var/list/book = list() - book["luceian book of scripture"] = /obj/item/device/versebook/assunzione - book["pocket luceian book of scripture"] = /obj/item/device/versebook/assunzione/pocket + book["luceian book of scripture"] = /obj/item/versebook/assunzione + book["pocket luceian book of scripture"] = /obj/item/versebook/assunzione/pocket gear_tweaks += new /datum/gear_tweak/path(book) /datum/gear/religion/assunzione/orb diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index 1c9916398d7..cc561781715 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -72,7 +72,7 @@ /datum/gear/utility/paicard display_name = "personal AI device" - path = /obj/item/device/paicard + path = /obj/item/paicard /datum/gear/utility/classicwallet display_name = "wallet" @@ -98,11 +98,11 @@ /datum/gear/utility/recorder display_name = "universal recorder" - path = /obj/item/device/taperecorder + path = /obj/item/taperecorder /datum/gear/utility/camera display_name = "camera" - path = /obj/item/device/camera + path = /obj/item/camera /datum/gear/utility/himeo_kit display_name = "himean voidsuit kit" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm index 933cf64b787..58188a7284a 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm @@ -93,7 +93,7 @@ /datum/gear/ears/headlights display_name = "headlights" - path = /obj/item/device/flashlight/headlights + path = /obj/item/flashlight/headlights cost = 2 whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) sort_category = "Xenowear - IPC" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index c35a13bc57a..c4e66cd0d2b 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -356,7 +356,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /datum/gear/accessory/tajaranbooksrel display_name = "tajaran religious books" description = "Tajaran religious texts." - path = /obj/item/device/versebook/twinsuns + path = /obj/item/versebook/twinsuns sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) flags = GEAR_HAS_DESC_SELECTION @@ -364,8 +364,8 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /datum/gear/accessory/tajaranbooksrel/New() ..() var/list/card = list() - card["holy scrolls"] = /obj/item/device/versebook/twinsuns - card["ma'ta'ke legends"] = /obj/item/device/versebook/matake + card["holy scrolls"] = /obj/item/versebook/twinsuns + card["ma'ta'ke legends"] = /obj/item/versebook/matake gear_tweaks += new /datum/gear_tweak/path(card) // Accessories @@ -678,7 +678,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /datum/gear/accessory/tajaranbookspol display_name = "tajaran political books" description = "Tajaran books on the Adhomian ideologies." - path = /obj/item/device/versebook/pra + path = /obj/item/versebook/pra sort_category = "Xenowear - Tajara" whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) flags = GEAR_HAS_DESC_SELECTION @@ -686,9 +686,9 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /datum/gear/accessory/tajaranbookspol/New() ..() var/list/card = list() - card["hadiist manifesto"] = /obj/item/device/versebook/pra - card["in defense of al'mari's legacy"] = /obj/item/device/versebook/dpra - card["the new kingdom"] = /obj/item/device/versebook/nka + card["hadiist manifesto"] = /obj/item/versebook/pra + card["in defense of al'mari's legacy"] = /obj/item/versebook/dpra + card["the new kingdom"] = /obj/item/versebook/nka gear_tweaks += new /datum/gear_tweak/path(card) /datum/gear/accessory/tajaran_portraits @@ -754,7 +754,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /datum/gear/tajara_camera display_name = "adhomian camera" - path = /obj/item/device/camera/adhomai + path = /obj/item/camera/adhomai whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) sort_category = "Xenowear - Tajara" flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index 459e7bbd523..30b8ac0388b 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -156,7 +156,7 @@ /datum/gear/religion/unathi_book display_name = "unathi religious texts" - path = /obj/item/device/versebook/skakh + path = /obj/item/versebook/skakh cost = 1 whitelisted = list(SPECIES_UNATHI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Unathi" @@ -165,10 +165,10 @@ /datum/gear/religion/unathi_book/New() ..() var/list/unathi_book = list() - unathi_book["Sk'akh Legends"] = /obj/item/device/versebook/skakh - unathi_book["assorted Th'akh fables"] = /obj/item/device/versebook/thakh - unathi_book["Reflections on the Aut'akh Faith"] = /obj/item/device/versebook/autakh - unathi_book["Writings of Judizah Si'akh"] = /obj/item/device/versebook/siakh + unathi_book["Sk'akh Legends"] = /obj/item/versebook/skakh + unathi_book["assorted Th'akh fables"] = /obj/item/versebook/thakh + unathi_book["Reflections on the Aut'akh Faith"] = /obj/item/versebook/autakh + unathi_book["Writings of Judizah Si'akh"] = /obj/item/versebook/siakh gear_tweaks += new /datum/gear_tweak/path(unathi_book) /datum/gear/uniform/unathi diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index db15757d7e5..7c14b366c05 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -10,7 +10,7 @@ /obj/item/clothing/attackby(obj/item/attacking_item, mob/user) if(IC && (istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.tool_behaviour == TOOL_WRENCH || attacking_item.tool_behaviour == TOOL_CROWBAR || \ - istype(attacking_item, /obj/item/device/integrated_electronics/wirer) || istype(attacking_item, /obj/item/device/integrated_electronics/debugger) || \ + istype(attacking_item, /obj/item/integrated_electronics/wirer) || istype(attacking_item, /obj/item/integrated_electronics/debugger) || \ attacking_item.tool_behaviour == TOOL_MULTITOOL || attacking_item.tool_behaviour == TOOL_SCREWDRIVER || istype(attacking_item, /obj/item/cell/device))) IC.attackby(attacking_item, user) diff --git a/code/modules/clothing/factions/idris.dm b/code/modules/clothing/factions/idris.dm index 71599ddf72f..f2a7c3b0cc4 100644 --- a/code/modules/clothing/factions/idris.dm +++ b/code/modules/clothing/factions/idris.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/item/clothing/suit/storage/toggle/idris_iru_coats.dmi' icon_state = "idris_coat" item_state = "idris_coat" - allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight) + allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight) body_parts_covered = UPPER_TORSO cold_protection = 0 min_cold_protection_temperature = 0 diff --git a/code/modules/clothing/factions/scc.dm b/code/modules/clothing/factions/scc.dm index 106af07e58b..67bc37d70eb 100644 --- a/code/modules/clothing/factions/scc.dm +++ b/code/modules/clothing/factions/scc.dm @@ -27,7 +27,7 @@ /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, - /obj/item/device/flashlight + /obj/item/flashlight ) body_parts_covered = UPPER_TORSO armor = list( @@ -57,7 +57,7 @@ /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, - /obj/item/device/flashlight + /obj/item/flashlight ) body_parts_covered = UPPER_TORSO|ARMS armor = list( diff --git a/code/modules/clothing/factions/trinary.dm b/code/modules/clothing/factions/trinary.dm index b2ca610e1d7..49d217cb07f 100644 --- a/code/modules/clothing/factions/trinary.dm +++ b/code/modules/clothing/factions/trinary.dm @@ -71,7 +71,7 @@ ) contained_sprite = TRUE slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) /obj/item/clothing/mask/exclusionist name = "exclusionist mask" diff --git a/code/modules/clothing/sets/acting_captain.dm b/code/modules/clothing/sets/acting_captain.dm index 273ff317da7..0d0acf76a9b 100644 --- a/code/modules/clothing/sets/acting_captain.dm +++ b/code/modules/clothing/sets/acting_captain.dm @@ -30,5 +30,5 @@ /obj/item/clothing/head/acapcap = 1, /obj/item/clothing/suit/acapjacket = 1, /obj/item/clothing/accessory/armband/acap = 1, - /obj/item/device/radio/headset/heads/captain = 1 + /obj/item/radio/headset/heads/captain = 1 ) diff --git a/code/modules/clothing/sets/laser_tag.dm b/code/modules/clothing/sets/laser_tag.dm index 94ef1ea77bd..6d96de618a2 100644 --- a/code/modules/clothing/sets/laser_tag.dm +++ b/code/modules/clothing/sets/laser_tag.dm @@ -130,7 +130,7 @@ var/gun_path = /obj/item/gun/energy/lasertag/red /obj/structure/closet/lasertag/fill() - new /obj/item/device/multitool(src) + new /obj/item/multitool(src) for(var/i = 1 to 3) new helmet_path(src) new armor_path(src) diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 1e11f61a87f..47792f336f8 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -14,7 +14,7 @@ icon_state = "flash" interface_name = "mounted flash" interface_desc = "Stuns your target by blinding them with a bright light." - device_type = /obj/item/device/flash + device_type = /obj/item/flash category = MODULE_LIGHT_COMBAT /obj/item/rig_module/grenade_launcher diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 833260b19d3..7be43b9d1d4 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -124,7 +124,7 @@ return TRUE // Okay, it wasn't a terminal being touched, check for all the simple insertions. - if(input_device.type in list(/obj/item/device/paicard, /obj/item/device/mmi, /obj/item/device/mmi/digital/posibrain)) + if(input_device.type in list(/obj/item/paicard, /obj/item/mmi, /obj/item/mmi/digital/posibrain)) if(integrated_ai) integrated_ai.attackby(input_device,user) // If the transfer was successful, we can clear out our vars. diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index b2dab2c2600..170e7a352f1 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -349,7 +349,7 @@ /obj/item/rig_module/device/door_hack/process() if(holder && holder.wearer) - if(!(locate(/obj/item/device/multitool/hacktool/rig) in holder.wearer)) + if(!(locate(/obj/item/multitool/hacktool/rig) in holder.wearer)) deactivate() return FALSE @@ -368,7 +368,7 @@ deactivate() return - var/obj/item/device/multitool/hacktool/rig/hacktool = new(M) + var/obj/item/multitool/hacktool/rig/hacktool = new(M) hacktool.creator = M M.put_in_hands(hacktool) @@ -380,5 +380,5 @@ if(!M) return - for(var/obj/item/device/multitool/hacktool/rig/hacktool in M.contents) + for(var/obj/item/multitool/hacktool/rig/hacktool in M.contents) qdel(hacktool) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 0bc0aefb344..0266a0805a6 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -46,7 +46,7 @@ construction_cost = list("$glass" = 5250, DEFAULT_WALL_MATERIAL = 2500) construction_time = 300 - device_type = /obj/item/device/healthanalyzer + device_type = /obj/item/healthanalyzer category = MODULE_MEDICAL @@ -101,7 +101,7 @@ engage_string = "Begin Scan" usable = TRUE selectable = 0 - device_type = /obj/item/device/ano_scanner + device_type = /obj/item/ano_scanner category = MODULE_UTILITY diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index ebc43a992c7..d17f36f8a0c 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -47,7 +47,7 @@ /obj/item/clothing/suit/space/rig name = "chestpiece" - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -99,7 +99,7 @@ /obj/item/clothing/suit/lightrig name = "suit" - allowed = list(/obj/item/device/flashlight) + allowed = list(/obj/item/flashlight) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 2ec754b0c54..68c4ecbaf51 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -23,7 +23,7 @@ species_restricted = list(BODYTYPE_UNATHI) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton,/obj/item/melee/energy) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/melee/energy) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT @@ -135,7 +135,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/vaurca air_type = /obj/item/tank/phoron - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton,/obj/item/melee/energy) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/melee/energy) initial_modules = list( /obj/item/rig_module/actuators/combat, @@ -195,7 +195,7 @@ species_restricted = list(BODYTYPE_TAJARA) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton,/obj/item/melee/energy) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton,/obj/item/melee/energy) initial_modules = list( /obj/item/rig_module/actuators/combat, diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 3913ab34014..81aa913ffcd 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -21,7 +21,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/combat boot_type = /obj/item/clothing/shoes/magboots/rig/chonk - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT @@ -61,7 +61,7 @@ siemens_coefficient = 0.1 offline_slowdown = 3 offline_vision_restriction = TINT_HEAVY - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) species_restricted = list(BODYTYPE_HUMAN) @@ -185,9 +185,9 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/heavy allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, @@ -238,7 +238,7 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -291,7 +291,7 @@ offline_vision_restriction = TINT_HEAVY boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -361,7 +361,7 @@ boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -413,7 +413,7 @@ slowdown = 8 offline_slowdown = 10 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_UTILITY @@ -457,7 +457,7 @@ offline_vision_restriction = TINT_HEAVY slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -489,7 +489,7 @@ offline_vision_restriction = TINT_HEAVY offline_slowdown = 10 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -600,9 +600,9 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/legionnaire allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index c016a6711ed..fd699f9409e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -25,9 +25,9 @@ ) siemens_coefficient = 0.1 allowed = list( - /obj/item/device/flashlight, /obj/item/tank, /obj/item/device/t_scanner, /obj/item/rfd/construction, /obj/item/crowbar, \ - /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/device/multitool, \ - /obj/item/device/radio, /obj/item/device/analyzer, /obj/item/storage/bag/inflatable, /obj/item/melee/baton, /obj/item/gun, \ + /obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rfd/construction, /obj/item/crowbar, \ + /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \ + /obj/item/radio, /obj/item/analyzer, /obj/item/storage/bag/inflatable, /obj/item/melee/baton, /obj/item/gun, \ /obj/item/storage/firstaid, /obj/item/reagent_containers/hypospray, /obj/item/roller,/obj/item/material/twohanded/fireaxe) initial_modules = list( /obj/item/rig_module/ai_container, diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index db022b1f859..ccc4a6821ac 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -6,7 +6,7 @@ icon_state = "ninja_rig" icon_supported_species_tags = list("ipc", "skr", "taj", "una") suit_type = "light suit" - allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/cell,/obj/item/material/twohanded/fireaxe) + allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/cell,/obj/item/material/twohanded/fireaxe) armor = list( MELEE = ARMOR_MELEE_MAJOR, BULLET = ARMOR_BALLISTIC_SMALL, @@ -209,7 +209,7 @@ icon = 'icons/obj/item/clothing/rig/offworlder.dmi' icon_state = "offworlder_rig" icon_supported_species_tags = null - allowed = list(/obj/item/tank, /obj/item/device/flashlight) + allowed = list(/obj/item/tank, /obj/item/flashlight) armor = list( BIO = ARMOR_BIO_MINOR, RAD = ARMOR_RAD_MINOR @@ -268,7 +268,7 @@ icon_supported_species_tags = null allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, /obj/item/gun, /obj/item/ammo_magazine, @@ -333,7 +333,7 @@ slowdown = 1 offline_vision_restriction = TINT_BLIND // Visorless helmet sprite, the helmet's face is just a camera. - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT chest_type = /obj/item/clothing/suit/space/rig/light/falcata diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 763552fa811..d0e39dd9851 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -26,7 +26,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/merc boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) req_access = list(ACCESS_SYNDICATE) @@ -93,7 +93,7 @@ offline_vision_restriction = TINT_HEAVY emp_protection = 20 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) helm_type = /obj/item/clothing/head/helmet/space/rig/merc/distress boot_type = /obj/item/clothing/shoes/magboots/rig/chonk diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index c85993ae7a0..e90b23e00e2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -26,7 +26,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/skrell boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 47c048b3980..7560a49b408 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -41,7 +41,7 @@ offline_slowdown = 0 offline_vision_restriction = TINT_HEAVY - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/briefcase,/obj/item/storage/secure/briefcase) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/briefcase,/obj/item/storage/secure/briefcase) req_access = list() req_one_access = list() @@ -96,7 +96,7 @@ chest_type = /obj/item/clothing/suit/space/rig/industrial boot_type = /obj/item/clothing/shoes/magboots/rig/medium - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka,/obj/item/material/twohanded/fireaxe,/obj/item/gun/energy/vaurca/thermaldrill,/obj/item/storage/backpack/cell,/obj/item/rfd/mining) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka,/obj/item/material/twohanded/fireaxe,/obj/item/gun/energy/vaurca/thermaldrill,/obj/item/storage/backpack/cell,/obj/item/rfd/mining) req_access = list() req_one_access = list() @@ -175,7 +175,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/eva glove_type = /obj/item/clothing/gloves/rig/eva - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell) req_access = list() req_one_access = list() @@ -256,7 +256,7 @@ glove_type = /obj/item/clothing/gloves/rig/ce boot_type = /obj/item/clothing/shoes/magboots/rig/advanced - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/backpack/cell,/obj/item/storage/toolbox,/obj/item/storage/bag/inflatable) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/backpack/cell,/obj/item/storage/toolbox,/obj/item/storage/bag/inflatable) req_access = list() req_one_access = list() @@ -301,7 +301,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/box/unique/excavation,/obj/item/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/material/twohanded/fireaxe,/obj/item/device/breath_analyzer) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/box/unique/excavation,/obj/item/pickaxe,/obj/item/healthanalyzer,/obj/item/measuring_tape,/obj/item/ano_scanner,/obj/item/depth_scanner,/obj/item/core_sampler,/obj/item/gps,/obj/item/beacon_locator,/obj/item/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/material/twohanded/fireaxe,/obj/item/breath_analyzer) req_access = list() req_one_access = list() @@ -342,7 +342,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/medical - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/roller,/obj/item/material/twohanded/fireaxe,/obj/item/device/breath_analyzer,/obj/item/reagent_containers/blood) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/roller,/obj/item/material/twohanded/fireaxe,/obj/item/breath_analyzer,/obj/item/reagent_containers/blood) req_access = list() req_one_access = list() @@ -384,7 +384,7 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/hazard boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) req_access = list() req_one_access = list() @@ -429,7 +429,7 @@ offline_vision_restriction = TINT_HEAVY boot_type = /obj/item/clothing/shoes/magboots/rig/chonk - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/t_scanner,/obj/item/rfd/construction) req_access = list() req_one_access = list() diff --git a/code/modules/clothing/spacesuits/rig/suits/terminator.dm b/code/modules/clothing/spacesuits/rig/suits/terminator.dm index b7c2e719417..da1fe6b1d8c 100644 --- a/code/modules/clothing/spacesuits/rig/suits/terminator.dm +++ b/code/modules/clothing/spacesuits/rig/suits/terminator.dm @@ -20,9 +20,9 @@ has_sealed_state = TRUE allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, diff --git a/code/modules/clothing/spacesuits/rig/suits/xanu.dm b/code/modules/clothing/spacesuits/rig/suits/xanu.dm index af11f57c67c..d8b4502a1c4 100644 --- a/code/modules/clothing/spacesuits/rig/suits/xanu.dm +++ b/code/modules/clothing/spacesuits/rig/suits/xanu.dm @@ -18,7 +18,7 @@ RAD = ARMOR_RAD_SMALL, ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY siemens_coefficient = 0.2 @@ -93,7 +93,7 @@ breach_threshold = 18 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit + /obj/item/suit_cooling_unit ) diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index f67bccec010..0155c8f9a5d 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -51,7 +51,7 @@ permeability_coefficient = 0.02 item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/device/suit_cooling_unit, /obj/item/tank) + allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/suit_cooling_unit, /obj/item/tank) slowdown = 1 armor = list( BIO = ARMOR_BIO_SHIELDED, diff --git a/code/modules/clothing/spacesuits/void/alien/skrell.dm b/code/modules/clothing/spacesuits/void/alien/skrell.dm index ffa2b77fb46..9af30cc4971 100644 --- a/code/modules/clothing/spacesuits/void/alien/skrell.dm +++ b/code/modules/clothing/spacesuits/void/alien/skrell.dm @@ -33,7 +33,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SHIELDED ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe, /obj/item/rfd/construction) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rfd/construction) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE species_restricted = list(BODYTYPE_SKRELL,BODYTYPE_HUMAN) diff --git a/code/modules/clothing/spacesuits/void/alien/tajara.dm b/code/modules/clothing/spacesuits/void/alien/tajara.dm index d03cdc4a049..99ac1d45b0a 100644 --- a/code/modules/clothing/spacesuits/void/alien/tajara.dm +++ b/code/modules/clothing/spacesuits/void/alien/tajara.dm @@ -17,9 +17,9 @@ RAD = ARMOR_RAD_SMALL ) allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, @@ -64,9 +64,9 @@ item_state = "okonsuit-red" contained_sprite = TRUE allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, @@ -139,9 +139,9 @@ RAD = ARMOR_RAD_SMALL ) allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, @@ -188,9 +188,9 @@ RAD = ARMOR_RAD_SMALL ) allowed = list( - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/tank, - /obj/item/device/suit_cooling_unit, + /obj/item/suit_cooling_unit, /obj/item/gun, /obj/item/ammo_magazine, /obj/item/ammo_casing, diff --git a/code/modules/clothing/spacesuits/void/alien/unathi.dm b/code/modules/clothing/spacesuits/void/alien/unathi.dm index 9b8b2cd23bf..bf68720dc01 100644 --- a/code/modules/clothing/spacesuits/void/alien/unathi.dm +++ b/code/modules/clothing/spacesuits/void/alien/unathi.dm @@ -36,7 +36,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_UNATHI) refittable = FALSE @@ -102,7 +102,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/material/sword,/obj/item/melee/hammer,/obj/item/melee/energy) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/material/sword,/obj/item/melee/hammer,/obj/item/melee/energy) species_restricted = list(BODYTYPE_UNATHI) refittable = FALSE @@ -135,7 +135,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/material/sword,/obj/item/melee/hammer,/obj/item/melee/energy) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/material/sword,/obj/item/melee/hammer,/obj/item/melee/energy) species_restricted = list(BODYTYPE_UNATHI) refittable = FALSE diff --git a/code/modules/clothing/spacesuits/void/captain.dm b/code/modules/clothing/spacesuits/void/captain.dm index 0e0a6ad6a5a..61111fa9ae5 100644 --- a/code/modules/clothing/spacesuits/void/captain.dm +++ b/code/modules/clothing/spacesuits/void/captain.dm @@ -28,7 +28,7 @@ contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") w_class = WEIGHT_CLASS_BULKY - allowed = list(/obj/item/tank, /obj/item/device/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs) + allowed = list(/obj/item/tank, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs) armor = list( MELEE = ARMOR_MELEE_MAJOR, BULLET = ARMOR_BALLISTIC_PISTOL, diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index f83d394b597..69b5f38bb72 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -43,7 +43,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index fbafae3da81..3f16dda9ef9 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -37,7 +37,7 @@ RAD = ARMOR_RAD_SMALL ) slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) refittable = FALSE @@ -85,7 +85,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) icon_supported_species_tags = list("ipc", "skr", "taj") @@ -111,7 +111,7 @@ item_state = "xanu_voidsuit" contained_sprite = TRUE slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -204,7 +204,7 @@ RAD = ARMOR_RAD_SMALL ) slowdown = 1 - allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/tank,/obj/item/flashlight,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) refittable = FALSE @@ -249,7 +249,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/tank,/obj/item/flashlight,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) icon_supported_species_tags = list("ipc") @@ -300,7 +300,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI) @@ -354,7 +354,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) desc_extended = "An easily recognized Einstein Engines-made PMC voidsuit piece. It is a telltale mark of corporate espionage and more often than not ends up buried with its user." @@ -406,7 +406,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit. It is relatively fragile but has very apparent radiation shielding. Most often seen in the hands of post-disaster cleanup teams and private military contractors." @@ -458,7 +458,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) desc_extended = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military." @@ -509,7 +509,7 @@ RAD = ARMOR_RAD_SMALL ) slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) desc_extended = "A portable, sleek combat suit utilized in excess by Zavodskoi Interstellar private military contractors. It is known to be utilized by the company's most secretive sectors explicitly for espionage." @@ -558,7 +558,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) @@ -613,7 +613,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) icon_supported_species_tags = list("una") @@ -668,7 +668,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) @@ -1069,7 +1069,7 @@ RAD = ARMOR_RAD_SMALL ) slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) contained_sprite = TRUE diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index d4b957c62bc..f393f92148e 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -50,7 +50,7 @@ // Protects from up to 7500 degrees kelvin. max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 2500 max_pressure_protection = ENG_VOIDSUIT_MAX_PRESSURE - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable) //Mining rig /obj/item/clothing/head/helmet/space/void/mining @@ -96,7 +96,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_MINOR ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka, /obj/item/gun/energy/vaurca/thermaldrill,/obj/item/rfd/mining) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/pickaxe, /obj/item/gun/custom_ka, /obj/item/gun/energy/vaurca/thermaldrill,/obj/item/rfd/mining) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) //Medical Rig @@ -142,7 +142,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical,/obj/item/device/breath_analyzer,/obj/item/material/twohanded/fireaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/firstaid,/obj/item/healthanalyzer,/obj/item/stack/medical,/obj/item/breath_analyzer,/obj/item/material/twohanded/fireaxe) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) //Security @@ -190,7 +190,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_MINOR ) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) //Atmospherics Rig @@ -241,7 +241,7 @@ RAD = ARMOR_RAD_RESISTANT ) max_pressure_protection = FIRESUIT_MAX_PRESSURE - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe,/obj/item/material/twohanded/fireaxe,/obj/item/rfd/construction,/obj/item/storage/bag/inflatable) max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 // It is a suit designed for fire, enclosed refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) @@ -289,7 +289,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_RESISTANT ) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) + allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_TAJARA, BODYTYPE_IPC, BODYTYPE_UNATHI, BODYTYPE_SKRELL) //Science @@ -326,7 +326,7 @@ ) contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) armor = list( MELEE = ARMOR_MELEE_KNIVES, LASER = ARMOR_LASER_MINOR, diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 9ef1930b205..e2ee768481d 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -53,7 +53,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_MINOR ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.5 @@ -87,7 +87,7 @@ var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any. var/obj/item/clothing/head/helmet/helmet = null // Deployable helmet, if any. var/obj/item/tank/tank = null // Deployable tank, if any. - var/obj/item/device/suit_cooling_unit/cooler = null // Deployable suit cooler, if any + var/obj/item/suit_cooling_unit/cooler = null // Deployable suit cooler, if any /obj/item/clothing/suit/space/void/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() @@ -261,7 +261,7 @@ if(!istype(user,/mob/living)) return - if(istype(attacking_item, /obj/item/clothing/accessory) || istype(attacking_item, /obj/item/device/hand_labeler)) + if(istype(attacking_item, /obj/item/clothing/accessory) || istype(attacking_item, /obj/item/hand_labeler)) return ..() if(user.get_inventory_slot(src) == slot_wear_suit) @@ -324,7 +324,7 @@ user.drop_from_inventory(attacking_item, src) tank = attacking_item return - else if (istype(attacking_item, /obj/item/device/suit_cooling_unit)) + else if (istype(attacking_item, /obj/item/suit_cooling_unit)) if(cooler) to_chat(user, "\The [src] already has a suit cooler installed.") else if(tank) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index efb19fc8091..953462d8cf2 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit/armor - allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight,/obj/item/clothing/head/helmet) body_parts_covered = UPPER_TORSO|LOWER_TORSO item_flags = ITEM_FLAG_THICK_MATERIAL @@ -91,7 +91,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/device/flashlight) + allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/flashlight) /obj/item/clothing/suit/storage/toggle/armor/hos/Initialize() . = ..() @@ -299,7 +299,7 @@ desc = "A simple kevlar plate carrier." icon_state = "kvest" item_state = "kvest" - allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight) + allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight) siemens_coefficient = 0.5 armor = list( MELEE = ARMOR_MELEE_KNIVES, @@ -359,7 +359,7 @@ icon = 'icons/obj/item/clothing/department_uniforms/security.dmi' icon_state = "hazard_cadet" item_state = "hazard_cadet" - allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight) + allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight) siemens_coefficient = 0.5 armor = list( MELEE = ARMOR_MELEE_SMALL, @@ -506,7 +506,7 @@ BOMB = ARMOR_BOMB_PADDED, RAD = ARMOR_RAD_MINOR ) - allowed = list(/obj/item/gun/projectile, /obj/item/gun/energy, /obj/item/gun/launcher, /obj/item/melee, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/device/flashlight) + allowed = list(/obj/item/gun/projectile, /obj/item/gun/energy, /obj/item/gun/launcher, /obj/item/melee, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/flashlight) siemens_coefficient = 0.35 /obj/item/clothing/suit/storage/vest/legion @@ -523,7 +523,7 @@ /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/material/twohanded/pike/flag ) armor = list( diff --git a/code/modules/clothing/suits/hazardvests.dm b/code/modules/clothing/suits/hazardvests.dm index fc212bc5944..8e6d31aa9b4 100644 --- a/code/modules/clothing/suits/hazardvests.dm +++ b/code/modules/clothing/suits/hazardvests.dm @@ -6,7 +6,7 @@ item_state = "hazard" contained_sprite = TRUE blood_overlay_type = "armor" - allowed = list (/obj/item/device/analyzer, /obj/item/device/flashlight, /obj/item/device/multitool, /obj/item/device/pipe_painter, /obj/item/device/radio, /obj/item/device/t_scanner, \ + allowed = list (/obj/item/analyzer, /obj/item/flashlight, /obj/item/multitool, /obj/item/pipe_painter, /obj/item/radio, /obj/item/t_scanner, \ /obj/item/crowbar, /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/tank/emergency_oxygen, \ /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering, /obj/item/storage/bag/inflatable) body_parts_covered = UPPER_TORSO diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 9f5b7f5417c..298071d7139 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -104,11 +104,11 @@ item_state = "nt_invest_coat" allowed = list( /obj/item/tank/emergency_oxygen, - /obj/item/device/flashlight, + /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/melee/baton, - /obj/item/device/taperecorder, + /obj/item/taperecorder, /obj/item/clothing/accessory/badge/investigator ) @@ -157,7 +157,7 @@ item_state = "detective" blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS - allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder,/obj/item/clothing/accessory/badge/investigator) + allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/taperecorder,/obj/item/clothing/accessory/badge/investigator) /obj/item/clothing/suit/storage/toggle/trench/det_trench/black name = "black trenchcoat" @@ -248,7 +248,7 @@ item_state = "nt_emt_jacket" blood_overlay_type = "armor" allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood, /obj/item/clothing/head/hardhat/paramedic) + /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency_oxygen, /obj/item/breath_analyzer, /obj/item/reagent_containers/blood, /obj/item/clothing/head/hardhat/paramedic) body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/toggle/para_jacket/zeng @@ -272,7 +272,7 @@ item_state = "paramed_armor" blood_overlay_type = "armor" allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood, /obj/item/clothing/head/hardhat/paramedic) + /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency_oxygen, /obj/item/breath_analyzer, /obj/item/reagent_containers/blood, /obj/item/clothing/head/hardhat/paramedic) body_parts_covered = UPPER_TORSO /obj/item/clothing/suit/storage/surgical_gown @@ -284,9 +284,9 @@ item_state = "generic_surgown" blood_overlay_type = "suit" allowed = list( - /obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe, - /obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, - /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer + /obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe, + /obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker, + /obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/breath_analyzer ) body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS armor = list( diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 87be2051502..e6faa6a1eb2 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -7,7 +7,7 @@ item_state = "labcoat" // used for inhands and onmobs. ESPECIALLY FOR CONTAINED SPRITES blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS - allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) + allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/breath_analyzer) armor = list( BIO = ARMOR_BIO_RESISTANT ) @@ -22,7 +22,7 @@ item_state = "labcoat_long" // used for inhands and onmobs. ESPECIALLY FOR CONTAINED SPRITES blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS - allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) + allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/breath_analyzer) armor = list( BIO = ARMOR_BIO_RESISTANT ) @@ -159,7 +159,7 @@ item_state = "labcoat_galatea" contained_sprite = TRUE body_parts_covered = UPPER_TORSO|ARMS - allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) + allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/breath_analyzer) armor = list( BIO = ARMOR_BIO_RESISTANT ) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 71f440e65d2..b4f5b06d970 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -64,7 +64,7 @@ item_state = "space_suit_syndicate" desc = "A crimson red plastic replica of a space suit. This is a toy, it is not made for use in space!" w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy) + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy) flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS|LEGS|FEET @@ -258,7 +258,7 @@ desc = "A military-styled jacket made from thick, distressed canvas. Popular among Martian punks. Patches not included." icon_state = "mgreen" item_state = "mgreen" - allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask) + allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask) /obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan icon_state = "mtan" @@ -405,7 +405,7 @@ icon = 'icons/obj/tracksuit.dmi' icon_state = "trackjacket" item_state = "trackjacket" - allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/cigarettes, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask) + allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/cigarettes, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask) contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/track/blue @@ -437,7 +437,7 @@ desc = "A favorite of jocks everywhere from Sol to the Coalition." icon_state = "varsity" item_state = "varsity" - allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask) + allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask) /obj/item/clothing/suit/storage/toggle/varsity/red name = "red varsity jacket" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 07f75cae902..aeea02e77ed 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -26,7 +26,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS siemens_coefficient = 0.5 - allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/tank/oxygen,/obj/item/extinguisher,/obj/item/crowbar,/obj/item/material/twohanded/fireaxe) + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/tank/oxygen,/obj/item/extinguisher,/obj/item/crowbar,/obj/item/material/twohanded/fireaxe) slowdown = 0.8 // slightly better than voidsuits flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL max_pressure_protection = FIRESUIT_MAX_PRESSURE @@ -232,7 +232,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas,/obj/item/reagent_containers/hypospray/autoinjector) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas,/obj/item/reagent_containers/hypospray/autoinjector) slowdown = 1.5 armor = list( BIO = ARMOR_BIO_RESISTANT, diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 10b31459aa3..38b59a215dd 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -179,7 +179,7 @@ flags_inv = 0 hoodtype = /obj/item/clothing/head/winterhood/hoodie/taj_scrubs allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood) + /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/emergency_oxygen, /obj/item/breath_analyzer, /obj/item/reagent_containers/blood) species_restricted = list(BODYTYPE_TAJARA) desc_extended = null @@ -332,7 +332,7 @@ BOMB = ARMOR_BOMB_MINOR ) siemens_coefficient = 0.50 - allowed = list(/obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/gun/projectile/automatic/rifle/adhomian, /obj/item/device/flashlight) + allowed = list(/obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/gun/projectile/automatic/rifle/adhomian, /obj/item/flashlight) /obj/item/clothing/suit/storage/tajaran/dpra_jacket name = "al'mariist jacket" @@ -396,7 +396,7 @@ item_state = "hunter_coat" contained_sprite = TRUE body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/gun/projectile/shotgun, /obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/material/knife, /obj/item/device/flashlight) + allowed = list(/obj/item/gun/projectile/shotgun, /obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/material/knife, /obj/item/flashlight) /obj/item/clothing/suit/storage/tajaran/archeologist name = "archeologist jacket" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 2c0e2d5a59f..900dc3ddb9a 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -1232,7 +1232,7 @@ color = "#3429d1" allowed = list( /obj/item/reagent_containers/spray/plantbgone, - /obj/item/device/analyzer/plant_analyzer, + /obj/item/analyzer/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/fertilizer, /obj/item/material/minihoe @@ -1249,11 +1249,11 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, - /obj/item/device/healthanalyzer, - /obj/item/device/flashlight, - /obj/item/device/radio, + /obj/item/healthanalyzer, + /obj/item/flashlight, + /obj/item/radio, /obj/item/tank/emergency_oxygen, - /obj/item/device/breath_analyzer, + /obj/item/breath_analyzer, /obj/item/reagent_containers/blood ) diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm index 4bba114b183..c8eb1ff99fd 100644 --- a/code/modules/cooking/machinery/commissary.dm +++ b/code/modules/cooking/machinery/commissary.dm @@ -90,14 +90,14 @@ contents_path = "-toy" accepted_items = list(/obj/item/toy, /obj/item/lipstick, - /obj/item/device/paicard, - /obj/item/device/camera, - /obj/item/device/synthesized_instrument, + /obj/item/paicard, + /obj/item/camera, + /obj/item/synthesized_instrument, /obj/item/storage/box/unique/snappops, /obj/item/haircomb, /obj/item/storage/box/fancy/crayons, /obj/item/melee/dinograbber, - /obj/item/device/laser_pointer, + /obj/item/laser_pointer, /obj/item/deck, /obj/item/storage/pill_bottle/dice, /obj/item/pen, diff --git a/code/modules/custom_ka/core.dm b/code/modules/custom_ka/core.dm index 519f28ef620..0860db6acde 100644 --- a/code/modules/custom_ka/core.dm +++ b/code/modules/custom_ka/core.dm @@ -567,14 +567,14 @@ origin_tech = list(TECH_POWER = 4,TECH_MAGNET = 4, TECH_DATA = 4) -/obj/item/device/kinetic_analyzer +/obj/item/kinetic_analyzer name = "kinetic analyzer" desc = "Analyzes the kinetic accelerator and prints useful information on it's statistics." - icon = 'icons/obj/item/device/kinetic_analyzer.dmi' + icon = 'icons/obj/item/kinetic_analyzer.dmi' icon_state = "kinetic_analyzer" -/obj/item/device/kinetic_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity, params) +/obj/item/kinetic_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity, params) user.visible_message( SPAN_WARNING("\The [user] scans \the [target] with \the [src]."), diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e494847f37f..9fbf73a4d95 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -178,7 +178,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "rex_watch" -/obj/item/device/camera/fluff/hadley_camera //Hadley's Camera - Hadley Dawson - fekkor +/obj/item/camera/fluff/hadley_camera //Hadley's Camera - Hadley Dawson - fekkor name = "customized camera" desc = "A early 2450's Sunny camera with an adjustable lens, this one has a sticker with the name \"Hadley\" on the back." icon = 'icons/obj/custom_items/hadley_camera.dmi' @@ -351,7 +351,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/device/radio/headset/fluff/resolve_headset //Antennae - Decisive Resolve - itanimulli +/obj/item/radio/headset/fluff/resolve_headset //Antennae - Decisive Resolve - itanimulli name = "antennae" desc = "Collapsible spherical antennae designed to interface with an IPC." icon = 'icons/obj/custom_items/resolve_items.dmi' @@ -481,7 +481,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette //Holo-symphette - Akinyi Idowu - kyres1 +/obj/item/synthesized_instrument/guitar/multi/fluff/akinyi_symphette //Holo-symphette - Akinyi Idowu - kyres1 name = "holo-symphette" desc = "A cheap, collapsible musical instrument which utilizes holographic projections to generate a rough noise. It's shaped like a small harp, and seems to be \ able to be tuned to mimic several old stringed Solarian instruments with some distorted audio. It's still got its price tag sticker on it." @@ -494,7 +494,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE var/deployed = FALSE -/obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette/update_icon() +/obj/item/synthesized_instrument/guitar/multi/fluff/akinyi_symphette/update_icon() if(deployed) icon_state = "akinyi_symphette_on" item_state = "akinyi_symphette_on" @@ -502,7 +502,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "akinyi_symphette" item_state = "akinyi_symphette" -/obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette/AltClick(var/mob/user) +/obj/item/synthesized_instrument/guitar/multi/fluff/akinyi_symphette/AltClick(var/mob/user) deployed = !deployed to_chat(user, SPAN_NOTICE("You [deployed ? "expand" : "collapse"] \the [src].")) update_icon() @@ -797,7 +797,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/device/megaphone/fluff/akinyi_mic //Resonance Microphone - Akinyi Idowu - kyres1 +/obj/item/megaphone/fluff/akinyi_mic //Resonance Microphone - Akinyi Idowu - kyres1 name = "resonance microphone" desc = "A rather costly voice amplifier disguised as a microphone. A button on the side permits the user to dial their vocal volume with ease." icon = 'icons/obj/custom_items/akinyi_symphette.dmi' @@ -818,11 +818,11 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "akinyi_stand-collapsed" w_class = WEIGHT_CLASS_SMALL contained_sprite = TRUE - var/obj/item/device/megaphone/fluff/akinyi_mic/mic + var/obj/item/megaphone/fluff/akinyi_mic/mic var/collapsed = TRUE /obj/item/fluff/akinyi_stand/attackby(obj/item/attacking_item, mob/user, params) - if(istype(attacking_item, /obj/item/device/megaphone/fluff/akinyi_mic)) + if(istype(attacking_item, /obj/item/megaphone/fluff/akinyi_mic)) if(!mic && !collapsed) user.unEquip(attacking_item) attacking_item.forceMove(src) @@ -888,14 +888,14 @@ All custom items with worn sprites must follow the contained sprite system: http storage_slots = 3 max_w_class = WEIGHT_CLASS_NORMAL can_hold = list( - /obj/item/device/megaphone/fluff/akinyi_mic, + /obj/item/megaphone/fluff/akinyi_mic, /obj/item/fluff/akinyi_stand, - /obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette + /obj/item/synthesized_instrument/guitar/multi/fluff/akinyi_symphette ) starts_with = list( - /obj/item/device/megaphone/fluff/akinyi_mic = 1, + /obj/item/megaphone/fluff/akinyi_mic = 1, /obj/item/fluff/akinyi_stand = 1, - /obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette = 1 + /obj/item/synthesized_instrument/guitar/multi/fluff/akinyi_symphette = 1 ) @@ -1560,7 +1560,7 @@ All custom items with worn sprites must follow the contained sprite system: http text = lightermsg else if(attacking_item.tool_behaviour == TOOL_WELDER) text = weldermsg - else if(istype(attacking_item, /obj/item/device/assembly/igniter)) + else if(istype(attacking_item, /obj/item/assembly/igniter)) text = ignitermsg else text = genericmsg @@ -1908,14 +1908,14 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "ashkii_cloak" contained_sprite = TRUE -/obj/item/device/versebook/fluff/guilty_men +/obj/item/versebook/fluff/guilty_men name = "Guilty Men" desc = "A leather bound book bearing a burning Coalition of Colonies flag. \"Guilty Men\" and \"How the Coalition of Colonies and its leaders failed the Frontier\" are engraved on golden plaques on either side of the flag. A controversial book published several years ago, \"Guilty Men\" is acclaimed by some as a scathing rebuke of failed Coalition policies, and their intolerable results, and condemned by others as a radical break from traditional Coalition attitudes and values. This example is worn, with its pages dog-eared and torn in numerous places, while the leather binding has begun to crack and discolor under frequent handling." icon = 'icons/obj/custom_items/imogen_items.dmi' icon_state = "Guilty_Men" item_state = "book" -/obj/item/device/versebook/fluff/guilty_men/Initialize() +/obj/item/versebook/fluff/guilty_men/Initialize() . = ..() randomquip = file2list("code/modules/customitems/imogen_guiltymen.txt") diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index 3b8fef0a5f5..2b4d4a7957f 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -17,9 +17,9 @@ new /obj/item/storage/box/swabs(src) new /obj/item/storage/box/fingerprints(src) new /obj/item/reagent_containers/spray/luminol(src) - new /obj/item/device/uv_light(src) + new /obj/item/uv_light(src) new /obj/item/forensics/sample_kit(src) new /obj/item/forensics/sample_kit/powder(src) - new /obj/item/device/mass_spectrometer(src) - new /obj/item/device/reagent_scanner(src) + new /obj/item/mass_spectrometer(src) + new /obj/item/reagent_scanner(src) new /obj/item/storage/box/fancy/csi_markers(src) diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm index aadbcc66cb2..4fd9d5f6bdd 100644 --- a/code/modules/detectivework/tools/evidencebag.dm +++ b/code/modules/detectivework/tools/evidencebag.dm @@ -105,7 +105,7 @@ examinate(user, stored_item, show_extended) /obj/item/evidencebag/attackby(obj/item/attacking_item, mob/user) - if(attacking_item.tool_behaviour == TOOL_PEN || istype(attacking_item, /obj/item/device/flashlight/pen)) + if(attacking_item.tool_behaviour == TOOL_PEN || istype(attacking_item, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe( tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN ) if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, SPAN_NOTICE("The label can be at most [MAX_NAME_LEN] characters long.")) diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm index fa426bb7d39..181d3a2dfd2 100644 --- a/code/modules/detectivework/tools/uvlight.dm +++ b/code/modules/detectivework/tools/uvlight.dm @@ -1,7 +1,7 @@ -/obj/item/device/uv_light +/obj/item/uv_light name = "\improper UV light" desc = "A small handheld black light." - icon = 'icons/obj/item/device/uv_light.dmi' + icon = 'icons/obj/item/uv_light.dmi' icon_state = "uv_off" item_state = "electronic" slot_flags = SLOT_BELT @@ -15,7 +15,7 @@ var/on = 0 var/step_alpha = 50 -/obj/item/device/uv_light/attack_self(var/mob/user) +/obj/item/uv_light/attack_self(var/mob/user) on = !on if(on) set_light(range, 2, "#7700dd") @@ -27,7 +27,7 @@ STOP_PROCESSING(SSprocessing, src) icon_state = "uv_off" -/obj/item/device/uv_light/proc/clear_last_scan() +/obj/item/uv_light/proc/clear_last_scan() if(scanned.len) for(var/atom/O in scanned) O.set_invisibility(scanned[O]) @@ -44,7 +44,7 @@ if(I.fluorescent == 2) I.fluorescent = 1 reset_objects.Cut() -/obj/item/device/uv_light/process() +/obj/item/uv_light/process() clear_last_scan() if(on) step_alpha = round(255/range) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 0f34b54c9e7..b3c06666744 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -1,7 +1,7 @@ -/obj/item/device/eftpos +/obj/item/eftpos name = "\improper EFTPOS scanner" desc = "Swipe your ID card to make purchases electronically." - icon = 'icons/obj/item/device/eftpos.dmi' + icon = 'icons/obj/item/eftpos.dmi' icon_state = "eftpos" item_state = "electronic" w_class = WEIGHT_CLASS_TINY @@ -15,7 +15,7 @@ var/datum/money_account/linked_account var/prelocked_account = null -/obj/item/device/eftpos/Initialize() +/obj/item/eftpos/Initialize() ..() machine_id = "[station_name()] EFTPOS #[SSeconomy.num_financial_terminals++]" access_code = rand(1111,111111) @@ -24,14 +24,14 @@ return INITIALIZE_HINT_LATELOAD -/obj/item/device/eftpos/proc/link_account() +/obj/item/eftpos/proc/link_account() //Link to the station account, unless prelocked_account is set if(!prelocked_account) linked_account = SSeconomy.station_account else linked_account = SSeconomy.get_department_account(prelocked_account) -/obj/item/device/eftpos/LateInitialize() +/obj/item/eftpos/LateInitialize() print_reference() //create a short manual as well @@ -60,7 +60,7 @@ R.AddOverlays(stampoverlay) R.stamps += "
This paper has been stamped by the EFTPOS device." -/obj/item/device/eftpos/proc/print_reference() +/obj/item/eftpos/proc/print_reference() var/obj/item/paper/R = new(src.loc) var/pname = "Reference: [eftpos_name]" var/info = "[eftpos_name] reference

" @@ -81,7 +81,7 @@ D.wrapped = R D.name = "small parcel - 'EFTPOS access code'" -/obj/item/device/eftpos/attack_self(mob/user as mob) +/obj/item/eftpos/attack_self(mob/user as mob) if(get_dist(src,user) <= 1) var/dat = "[eftpos_name]
" dat += "This terminal is [machine_id]. Report this code when contacting IT Support
" @@ -112,7 +112,7 @@ else user << browse(null,"window=eftpos") -/obj/item/device/eftpos/attackby(obj/item/attacking_item, mob/user) +/obj/item/eftpos/attackby(obj/item/attacking_item, mob/user) var/obj/item/card/id/I = attacking_item.GetID() @@ -154,7 +154,7 @@ else ..() -/obj/item/device/eftpos/Topic(var/href, var/href_list) +/obj/item/eftpos/Topic(var/href, var/href_list) if(href_list["choice"]) switch(href_list["choice"]) if("change_code") @@ -230,7 +230,7 @@ src.attack_self(usr) -/obj/item/device/eftpos/proc/scan_card(var/obj/item/card/I, var/obj/item/ID_container) +/obj/item/eftpos/proc/scan_card(var/obj/item/card/I, var/obj/item/ID_container) if (istype(I, /obj/item/card/id)) var/obj/item/card/id/C = I if(I==ID_container || ID_container == null) diff --git a/code/modules/economy/quikpay.dm b/code/modules/economy/quikpay.dm index 3407ce5e13d..12d92abcabb 100644 --- a/code/modules/economy/quikpay.dm +++ b/code/modules/economy/quikpay.dm @@ -1,9 +1,9 @@ -/obj/item/device/quikpay +/obj/item/quikpay name = "\improper Idris Quik-Pay" desc = "Swipe your ID to make direct company purchases." - icon = 'icons/obj/item/device/eftpos.dmi' + icon = 'icons/obj/item/eftpos.dmi' icon_state = "quikpay" item_state = "electronic" w_class = WEIGHT_CLASS_SMALL @@ -19,7 +19,7 @@ var/receipt = "" var/destinationact = "Service" -/obj/item/device/quikpay/Initialize() +/obj/item/quikpay/Initialize() . = ..() machine_id = "[station_name()] Idris Quik-Pay #[SSeconomy.num_financial_terminals++]" @@ -49,14 +49,14 @@ R.AddOverlays(stampoverlay) R.stamps += "
This paper has been stamped by the Executive Officer's desk." -/obj/item/device/quikpay/AltClick(var/mob/user) +/obj/item/quikpay/AltClick(var/mob/user) var/obj/item/card/id/I = user.GetIdCard() if(istype(I) && (ACCESS_HEADS in I.access)) editmode = TRUE to_chat(user, SPAN_NOTICE("Command access granted.")) SStgui.update_uis(src) -/obj/item/device/quikpay/proc/print_receipt() +/obj/item/quikpay/proc/print_receipt() var/obj/item/paper/R = new(usr.loc) var/receiptname = "Receipt: [machine_id]" R.set_content_unsafe(receiptname, receipt, sum) @@ -70,7 +70,7 @@ R.AddOverlays(stampoverlay) R.stamps += "
This paper has been stamped by the Quik-Pay device." -/obj/item/device/quikpay/attackby(obj/item/attacking_item, mob/user) +/obj/item/quikpay/attackby(obj/item/attacking_item, mob/user) if (istype(attacking_item, /obj/item/spacecash/ewallet)) var/obj/item/spacecash/ewallet/E = attacking_item var/transaction_amount = sum @@ -111,16 +111,16 @@ receipt = "" to_chat(user, SPAN_NOTICE("Transaction completed, please return to the home screen.")) -/obj/item/device/quikpay/attack_self(var/mob/user) +/obj/item/quikpay/attack_self(var/mob/user) ui_interact(user) -/obj/item/device/quikpay/ui_interact(mob/user, datum/tgui/ui) +/obj/item/quikpay/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "QuikPay", "Idris Quik-Pay", 400, 400) ui.open() -/obj/item/device/quikpay/ui_data(var/mob/user) +/obj/item/quikpay/ui_data(var/mob/user) var/list/data = list() data["items"] = items @@ -133,7 +133,7 @@ return data -/obj/item/device/quikpay/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/quikpay/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -224,12 +224,12 @@ destinationact = dest return TRUE -/obj/item/device/quikpay/proc/clear_order() +/obj/item/quikpay/proc/clear_order() buying.Cut() sum = 0 receipt = "" -/obj/item/device/quikpay/afterattack(atom/target, mob/user, proximity) +/obj/item/quikpay/afterattack(atom/target, mob/user, proximity) if (!proximity) return if (!istype(target, /obj)) return diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 0585aabc2bc..9e33236aa5f 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -63,7 +63,7 @@ ) /mob/living/carbon/brain/can_emote() - return (istype(container, /obj/item/device/mmi) && ..()) + return (istype(container, /obj/item/mmi) && ..()) /mob/living/carbon/brain default_emotes = list( diff --git a/code/modules/fabrication/designs/general/designs_arms.dm b/code/modules/fabrication/designs/general/designs_arms.dm index 8870a0ac67d..ce3994b8301 100644 --- a/code/modules/fabrication/designs/general/designs_arms.dm +++ b/code/modules/fabrication/designs/general/designs_arms.dm @@ -31,7 +31,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/armaments) /singleton/fabricator_recipe/armaments/electropack name = "electropack" - path = /obj/item/device/radio/electropack + path = /obj/item/radio/electropack hack_only = TRUE /singleton/fabricator_recipe/armaments/trap diff --git a/code/modules/fabrication/designs/general/designs_devices.dm b/code/modules/fabrication/designs/general/designs_devices.dm index 76c35e79c0c..199252ff93a 100644 --- a/code/modules/fabrication/designs/general/designs_devices.dm +++ b/code/modules/fabrication/designs/general/designs_devices.dm @@ -8,23 +8,23 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/components) /singleton/fabricator_recipe/components/igniter name = "igniter" - path = /obj/item/device/assembly/igniter + path = /obj/item/assembly/igniter /singleton/fabricator_recipe/components/signaler name = "signaler" - path = /obj/item/device/assembly/signaler + path = /obj/item/assembly/signaler /singleton/fabricator_recipe/components/sensor_infra name = "infrared sensor" - path = /obj/item/device/assembly/infra + path = /obj/item/assembly/infra /singleton/fabricator_recipe/components/timer name = "timer" - path = /obj/item/device/assembly/timer + path = /obj/item/assembly/timer /singleton/fabricator_recipe/components/sensor_prox name = "proximity sensor" - path = /obj/item/device/assembly/prox_sensor + path = /obj/item/assembly/prox_sensor /singleton/fabricator_recipe/components/cable_coil name = "cable coil" diff --git a/code/modules/fabrication/designs/general/designs_engineering.dm b/code/modules/fabrication/designs/general/designs_engineering.dm index 0cacbb3b75c..8efe91b5d07 100644 --- a/code/modules/fabrication/designs/general/designs_engineering.dm +++ b/code/modules/fabrication/designs/general/designs_engineering.dm @@ -28,7 +28,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/engineering) /singleton/fabricator_recipe/engineering/suit_cooling name = "portable suit cooling unit" - path = /obj/item/device/suit_cooling_unit/no_cell + path = /obj/item/suit_cooling_unit/no_cell /singleton/fabricator_recipe/engineering/emergency_cell name = "miniature cell" @@ -36,7 +36,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/engineering) /singleton/fabricator_recipe/engineering/debugger name = "debugger" - path = /obj/item/device/debugger + path = /obj/item/debugger /singleton/fabricator_recipe/engineering/floor_light name = "floor light" diff --git a/code/modules/fabrication/designs/general/designs_general.dm b/code/modules/fabrication/designs/general/designs_general.dm index 13093e38ce9..3ed2b610203 100644 --- a/code/modules/fabrication/designs/general/designs_general.dm +++ b/code/modules/fabrication/designs/general/designs_general.dm @@ -8,7 +8,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/general) /singleton/fabricator_recipe/general/flashlight name = "flashlight" - path = /obj/item/device/flashlight/empty + path = /obj/item/flashlight/empty /singleton/fabricator_recipe/general/extinguisher name = "extinguisher" @@ -16,11 +16,11 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/general) /singleton/fabricator_recipe/general/radio_headset name = "radio headset" - path = /obj/item/device/radio/headset + path = /obj/item/radio/headset /singleton/fabricator_recipe/general/radio_bounced name = "shortwave radio" - path = /obj/item/device/radio/off + path = /obj/item/radio/off /singleton/fabricator_recipe/general/weldermask name = "welding mask" @@ -28,7 +28,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/general) /singleton/fabricator_recipe/general/taperecorder name = "tape recorder" - path = /obj/item/device/taperecorder + path = /obj/item/taperecorder /singleton/fabricator_recipe/general/tube name = "light tube" @@ -40,12 +40,12 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/general) /singleton/fabricator_recipe/general/labeler name = "hand labeler" - path = /obj/item/device/hand_labeler + path = /obj/item/hand_labeler /singleton/fabricator_recipe/general/destTagger name = "destination tagger" - path = /obj/item/device/destTagger + path = /obj/item/destTagger /singleton/fabricator_recipe/general/cratescanner name = "crate contents scanner" - path = /obj/item/device/cratescanner + path = /obj/item/cratescanner diff --git a/code/modules/fabrication/designs/general/designs_tools.dm b/code/modules/fabrication/designs/general/designs_tools.dm index 9cf4c4cb49e..5646c16958b 100644 --- a/code/modules/fabrication/designs/general/designs_tools.dm +++ b/code/modules/fabrication/designs/general/designs_tools.dm @@ -8,15 +8,15 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/tools) /singleton/fabricator_recipe/tools/multitool name = "multitool" - path = /obj/item/device/multitool + path = /obj/item/multitool /singleton/fabricator_recipe/tools/geiger name = "geiger counter" - path = /obj/item/device/geiger + path = /obj/item/geiger /singleton/fabricator_recipe/tools/t_scanner name = "T-ray scanner" - path = /obj/item/device/t_scanner + path = /obj/item/t_scanner /singleton/fabricator_recipe/tools/weldertool name = "welding tool" diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index 68926bd2577..87d4e7b12e0 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -92,7 +92,7 @@ id = /obj/item/card/id suit = /obj/item/clothing/suit/space/emergency suit_store = /obj/item/tank/emergency_oxygen/double - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset back = /obj/item/storage/backpack /obj/outfit/admin/pod/post_equip(mob/living/carbon/human/H, visualsOnly) @@ -103,8 +103,8 @@ H.internals.icon_state = "internal1" //Spawn a drill new /obj/item/pickaxe/drill(H.loc) - new /obj/item/device/gps(H.loc) - new /obj/item/device/flashlight/flare/mech(H.loc) // spawns an active flare + new /obj/item/gps(H.loc) + new /obj/item/flashlight/flare/mech(H.loc) // spawns an active flare new /obj/item/clothing/suit/space/emergency(H.loc) // weak softsuit, so if for whatever reason new /obj/item/clothing/head/helmet/space/emergency(H.loc) // the survivor spawns with no EVA gear, new /obj/item/tank/emergency_oxygen/double(H.loc) // they can use this, and not just die in space @@ -119,7 +119,7 @@ /obj/item/lipstick/random = 2, /obj/item/haircomb/random = 1, /obj/item/spacecash/c1000 = 2, - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1 ) @@ -138,7 +138,7 @@ pda = /obj/item/modular_computer/handheld/pda/civilian/chaplain backpack_contents = list( - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1 ) @@ -163,9 +163,9 @@ accessory = /obj/item/clothing/accessory/tie/corporate/idris suit_accessory = /obj/item/clothing/accessory/pin/corporate/idris backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/pistol = 1, - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1, /obj/item/stamp/idris = 1 ) @@ -188,7 +188,7 @@ /obj/item/reagent_containers/inhaler/hyperzine = 2, /obj/item/reagent_containers/inhaler/soporific = 1, /obj/item/gun/projectile/leyon = 1, - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1 ) @@ -226,7 +226,7 @@ /obj/item/clothing/head/fake_culthood = 1, /obj/item/clothing/suit/fake_cultrobes = 1, /obj/item/deck/tarot = 1, - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1 ) @@ -257,7 +257,7 @@ /obj/outfit/admin/pod/tcfl name = "RescuePod - TCFL Member" head = /obj/item/clothing/head/beret/legion/field - l_ear = /obj/item/device/radio/headset/legion + l_ear = /obj/item/radio/headset/legion glasses = /obj/item/clothing/glasses/sunglasses/aviator suit = /obj/item/clothing/suit/storage/vest/legion suit_store = /obj/item/gun/energy/blaster/carbine @@ -276,8 +276,8 @@ /obj/item/melee/energy/sword/knife = 1, /obj/item/shield/riot/tact/legion = 1, /obj/item/grenade/flashbang = 1, - /obj/item/device/flashlight/flare = 1, - /obj/item/device/radio = 1 + /obj/item/flashlight/flare = 1, + /obj/item/radio = 1 ) /obj/outfit/admin/pod/tcfl/get_id_assignment() @@ -303,8 +303,8 @@ belt_contents = list( /obj/item/melee/energy/sword/knife/sol = 1, /obj/item/ammo_magazine/mc9mm = 1, - /obj/item/device/flashlight/flare = 1, - /obj/item/device/radio = 1 + /obj/item/flashlight/flare = 1, + /obj/item/radio = 1 ) backpack_contents = list( @@ -327,9 +327,9 @@ l_hand = /obj/item/storage/briefcase accessory = /obj/item/clothing/accessory/holster/hip/ backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/gun/energy/repeater = 1, - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1 ) @@ -353,10 +353,10 @@ accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1) back = /obj/item/storage/backpack/satchel/leather backpack_contents = list( - /obj/item/device/camera = 1, + /obj/item/camera = 1, /obj/item/clothing/suit/storage/toggle/bssb = 1, /obj/item/handcuffs = 1, - /obj/item/device/oxycandle = 1, + /obj/item/oxycandle = 1, /obj/item/airbubble = 1, /obj/item/ammo_magazine/c45m = 1 ) @@ -411,7 +411,7 @@ ) l_pocket = /obj/item/syndie/teleporter - r_pocket = /obj/item/device/special_uplink/burglar + r_pocket = /obj/item/special_uplink/burglar id = /obj/item/storage/wallet r_hand = /obj/item/storage/briefcase/black diff --git a/code/modules/ghostroles/spawner/human/pra.dm b/code/modules/ghostroles/spawner/human/pra.dm index ef2738d740f..e91ee59c9dd 100644 --- a/code/modules/ghostroles/spawner/human/pra.dm +++ b/code/modules/ghostroles/spawner/human/pra.dm @@ -68,5 +68,5 @@ /obj/item/storage/box/hadii_manifesto = 1, /obj/item/storage/box/hadii_card = 1 ) - l_hand = /obj/item/device/megaphone + l_hand = /obj/item/megaphone r_hand = /obj/item/martial_manual/tajara diff --git a/code/modules/ghostroles/spawner/human/zenghu.dm b/code/modules/ghostroles/spawner/human/zenghu.dm index 6a23ab8ec93..7fe22c07fb5 100644 --- a/code/modules/ghostroles/spawner/human/zenghu.dm +++ b/code/modules/ghostroles/spawner/human/zenghu.dm @@ -26,4 +26,4 @@ shoes = /obj/item/clothing/shoes/sneakers/medsci/zeng belt = /obj/item/storage/belt/utility/full id = /obj/item/card/id/zeng_hu - r_hand = /obj/item/device/flashlight + r_hand = /obj/item/flashlight diff --git a/code/modules/heavy_vehicle/equipment/medical.dm b/code/modules/heavy_vehicle/equipment/medical.dm index fb1e1f01421..66dac7818b8 100644 --- a/code/modules/heavy_vehicle/equipment/medical.dm +++ b/code/modules/heavy_vehicle/equipment/medical.dm @@ -319,7 +319,7 @@ /obj/item/mecha_equipment/mounted_system/medanalyzer name = "mounted health analyzer" icon_state = "mecha_healthyanalyzer" - holding_type = /obj/item/device/healthanalyzer/mech + holding_type = /obj/item/healthanalyzer/mech restricted_hardpoints = list(HARDPOINT_LEFT_HAND, HARDPOINT_RIGHT_HAND) restricted_software = list(MECH_SOFTWARE_MEDICAL) module_hints = list( @@ -328,16 +328,16 @@ ) /// Special health analyzer used by the exosuit health analyzer. -/obj/item/device/healthanalyzer/mech +/obj/item/healthanalyzer/mech name = "mounted health analyzer" var/obj/machinery/body_scanconsole/connected = null /// Toggle whether to do full or basic scan var/fullScan = FALSE -/obj/item/device/healthanalyzer/mech/get_hardpoint_maptext() +/obj/item/healthanalyzer/mech/get_hardpoint_maptext() return "[(fullScan ? "Full" : "Basic")]" -/obj/item/device/healthanalyzer/mech/Initialize() +/obj/item/healthanalyzer/mech/Initialize() . = ..() if(!connected) var/obj/machinery/body_scanconsole/S = new (src) @@ -345,13 +345,13 @@ S.update_use_power(POWER_USE_OFF) connected = S -/obj/item/device/healthanalyzer/mech/Destroy() +/obj/item/healthanalyzer/mech/Destroy() if(connected) QDEL_NULL(connected) . = ..() /obj/item/mecha_equipment/mounted_system/medanalyzer/CtrlClick(mob/user) - var/obj/item/device/healthanalyzer/mech/HA = holding + var/obj/item/healthanalyzer/mech/HA = holding if(istype(HA)) HA.fullScan = !HA.fullScan to_chat(user, SPAN_NOTICE("You switch to \the [src]'s [HA.fullScan ? "full body" : "basic"] scan mode.")) @@ -362,7 +362,7 @@ update_icon() owner.update_icon() -/obj/item/device/healthanalyzer/mech/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/healthanalyzer/mech/attack(mob/living/target_mob, mob/living/user, target_zone) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(src) var/mob/living/heavy_vehicle/user_vehicle = user @@ -380,7 +380,7 @@ return FALSE print_scan(target_mob, user_vehicle) -/obj/item/device/healthanalyzer/mech/proc/print_scan(var/mob/M, var/mob/living/heavy_vehicle/user_vehicle) +/obj/item/healthanalyzer/mech/proc/print_scan(var/mob/M, var/mob/living/heavy_vehicle/user_vehicle) var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(user_vehicle.loc, connected.format_occupant_data(get_medical_data(M)), "Scan ([M.name])", M) for(var/mob/pilot in user_vehicle.pilots) R.show_content(pilot) @@ -388,7 +388,7 @@ playsound(user_vehicle.loc, SFX_PRINT, 50, 1) R.forceMove(user_vehicle.loc) -/obj/item/device/healthanalyzer/mech/proc/get_medical_data(var/mob/living/carbon/human/H) +/obj/item/healthanalyzer/mech/proc/get_medical_data(var/mob/living/carbon/human/H) if (!ishuman(H)) return diff --git a/code/modules/heavy_vehicle/equipment/utility.dm b/code/modules/heavy_vehicle/equipment/utility.dm index 68e07b7d296..80b9b3fecab 100644 --- a/code/modules/heavy_vehicle/equipment/utility.dm +++ b/code/modules/heavy_vehicle/equipment/utility.dm @@ -589,12 +589,12 @@ /obj/item/gun/launcher/mech/flarelauncher/consume_next_projectile() if(proj < 1) return null - var/obj/item/device/flashlight/flare/mech/g = new (src) + var/obj/item/flashlight/flare/mech/g = new (src) proj-- addtimer(CALLBACK(src, PROC_REF(regen_proj)), proj_gen_time, TIMER_UNIQUE) return g -/obj/item/device/flashlight/flare/mech/Initialize() +/obj/item/flashlight/flare/mech/Initialize() fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds. on = 1 src.force = on_damage diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm index be9a4955593..b7f251cae55 100644 --- a/code/modules/heavy_vehicle/mech_interaction.dm +++ b/code/modules/heavy_vehicle/mech_interaction.dm @@ -472,7 +472,7 @@ playsound(user.loc, 'sound/items/Screwdriver.ogg', 50, 1) user.visible_message(SPAN_NOTICE("\The [user] installs \the [body.cell] into \the [src]."), SPAN_NOTICE("You install \the [body.cell] into \the [src].")) return - else if(istype(attacking_item, /obj/item/device/robotanalyzer)) + else if(istype(attacking_item, /obj/item/robotanalyzer)) to_chat(user, SPAN_NOTICE("Diagnostic Report for \the [src]:")) for(var/obj/item/mech_component/limb in list (head, body, arms, legs)) if(limb) diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm index dbd98e080d0..f02841c1886 100644 --- a/code/modules/heavy_vehicle/mecha.dm +++ b/code/modules/heavy_vehicle/mecha.dm @@ -19,7 +19,7 @@ var/offset_x = -8 var/offset_y = 0 - var/obj/item/device/radio/exosuit/radio + var/obj/item/radio/exosuit/radio var/obj/machinery/camera/camera var/wreckage_path = /obj/structure/mech_wreckage @@ -277,24 +277,24 @@ else to_chat(reciever, SPAN_WARNING("Error: No power cell was detected.")) -/obj/item/device/radio/exosuit +/obj/item/radio/exosuit name = "exosuit radio" cell = null -/obj/item/device/radio/exosuit/get_cell() +/obj/item/radio/exosuit/get_cell() . = ..() if(!.) var/mob/living/heavy_vehicle/E = loc if(istype(E)) return E.get_cell() -/obj/item/device/radio/exosuit/ui_host() +/obj/item/radio/exosuit/ui_host() var/mob/living/heavy_vehicle/E = loc if(istype(E)) return E return null -/obj/item/device/radio/exosuit/attack_self(var/mob/user) +/obj/item/radio/exosuit/attack_self(var/mob/user) var/mob/living/heavy_vehicle/exosuit = loc if(istype(exosuit) && exosuit.head && exosuit.head.radio && exosuit.head.radio.is_functional()) user.set_machine(src) @@ -302,14 +302,14 @@ else to_chat(user, SPAN_WARNING("The radio is too damaged to function.")) -/obj/item/device/radio/exosuit/CanUseTopic() +/obj/item/radio/exosuit/CanUseTopic() . = ..() if(.) var/mob/living/heavy_vehicle/exosuit = loc if(istype(exosuit) && exosuit.head && exosuit.head.radio && exosuit.head.radio.is_functional()) return ..() -/obj/item/device/radio/exosuit/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/ui_state/state = GLOB.mech_state) +/obj/item/radio/exosuit/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/ui_state/state = GLOB.mech_state) . = ..() /mob/living/heavy_vehicle/proc/become_remote() @@ -330,7 +330,7 @@ dummy.name = dummy.real_name // Give dummy a blank encryption key for later editing if spiderbot if(istype(dummy, /mob/living/simple_animal/spiderbot) && !istype(dummy, /mob/living/simple_animal/spiderbot/ai)) - dummy.radio.keyslot = new /obj/item/device/encryptionkey + dummy.radio.keyslot = new /obj/item/encryptionkey remove_verb(dummy, /mob/living/proc/ventcrawl) remove_verb(dummy, /mob/living/proc/hide) if(dummy_colour) diff --git a/code/modules/holidays/christmas/props.dm b/code/modules/holidays/christmas/props.dm index f0f9f7bfe37..7d79b7ae51b 100644 --- a/code/modules/holidays/christmas/props.dm +++ b/code/modules/holidays/christmas/props.dm @@ -139,8 +139,8 @@ /obj/item/toy/sword, /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, - /obj/item/device/paicard, - /obj/item/device/synthesized_instrument/violin, + /obj/item/paicard, + /obj/item/synthesized_instrument/violin, /obj/item/storage/belt/utility/full, /obj/item/clothing/accessory/horrible) @@ -224,12 +224,12 @@ /obj/item/toy/mech/phazon, /obj/item/toy/mech/ripley, /obj/item/toy/mech/seraph, - /obj/item/device/paicard, + /obj/item/paicard, /obj/item/clothing/accessory/horrible, - /obj/item/device/camera, + /obj/item/camera, /obj/item/bluespace_crystal, /obj/item/flame/lighter/zippo, - /obj/item/device/taperecorder, + /obj/item/taperecorder, /obj/item/storage/box/fancy/cigarettes/dromedaryco, /obj/item/toy/bosunwhistle, /obj/item/clothing/mask/fakemoustache, @@ -291,12 +291,12 @@ /obj/item/toy/sword, /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus, /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, - /obj/item/device/paicard, + /obj/item/paicard, /obj/item/clothing/accessory/horrible, /obj/item/clothing/shoes/heels, /obj/item/storage/box/unique/donkpockets, /obj/item/reagent_containers/glass/beaker/teapot, - /obj/item/device/flashlight/lantern, + /obj/item/flashlight/lantern, /obj/item/clothing/mask/balaclava, /obj/item/clothing/accessory/badge/old, /obj/item/clothing/mask/gas/mime, @@ -312,10 +312,10 @@ /obj/item/contraband/poster, /obj/item/clothing/head/hardhat/atmos, /mob/living/bot/cleanbot, - /obj/item/device/binoculars, - /obj/item/device/camera, - /obj/item/device/gps, - /obj/item/device/uv_light, + /obj/item/binoculars, + /obj/item/camera, + /obj/item/gps, + /obj/item/uv_light, /obj/random/loot, /obj/random/contraband, /obj/item/autochisel, @@ -323,12 +323,12 @@ /obj/item/ore/coal, /obj/item/ore/coal, /obj/item/phone, - /obj/item/device/dociler, - /obj/item/device/flashlight/maglight, - /obj/item/device/megaphone, - /obj/item/device/synthesized_instrument/violin, - /obj/item/device/synthesized_instrument/guitar, - /obj/item/device/synthesized_instrument/trumpet) + /obj/item/dociler, + /obj/item/flashlight/maglight, + /obj/item/megaphone, + /obj/item/synthesized_instrument/violin, + /obj/item/synthesized_instrument/guitar, + /obj/item/synthesized_instrument/trumpet) return picked_gift_type diff --git a/code/modules/holomap/portable_map_reader.dm b/code/modules/holomap/portable_map_reader.dm index c6b0f647bac..52a4180bc49 100644 --- a/code/modules/holomap/portable_map_reader.dm +++ b/code/modules/holomap/portable_map_reader.dm @@ -2,7 +2,7 @@ /obj/item/portable_map_reader name = "portable map reader" desc = "Displays a map of the local space, as well as any marked points of interest." - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps" item_state = "radio" contained_sprite = TRUE diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index 443d7a0b85e..ec0f33bae7e 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -133,7 +133,7 @@ B.fill() update_icon() return - else if(istype(attacking_item, /obj/item/device/analyzer/plant_analyzer)) + else if(istype(attacking_item, /obj/item/analyzer/plant_analyzer)) to_chat(user, SPAN_NOTICE("Scan result of \the [src]:")) to_chat(user, SPAN_NOTICE("Beehive is [bee_count ? "[round(bee_count)]% full" : "empty"].[bee_count > 90 ? " Colony is ready to split." : ""]")) if(frames) diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index ee8c44c58dd..b454938b000 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -23,9 +23,9 @@ transform = tf /// Like a health analyzer, but for plants! Tells you everything you need to know. -/obj/item/device/analyzer/plant_analyzer +/obj/item/analyzer/plant_analyzer name = "plant analyzer" - icon = 'icons/obj/item/device/plant_analyzer.dmi' + icon = 'icons/obj/item/plant_analyzer.dmi' icon_state = "hydro" item_state = "hydro" var/form_title @@ -33,7 +33,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 80, MATERIAL_GLASS = 20) origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 1) -/obj/item/device/analyzer/plant_analyzer/proc/print_report_verb() +/obj/item/analyzer/plant_analyzer/proc/print_report_verb() set name = "Print Plant Report" set category = "Object.Held" set src = usr @@ -42,13 +42,13 @@ return print_report(usr) -/obj/item/device/analyzer/plant_analyzer/Topic(href, href_list) +/obj/item/analyzer/plant_analyzer/Topic(href, href_list) if(..()) return if(href_list["print"]) print_report(usr) -/obj/item/device/analyzer/plant_analyzer/proc/print_report(var/mob/living/user) +/obj/item/analyzer/plant_analyzer/proc/print_report(var/mob/living/user) if(!last_data) to_chat(user, "There is no scan data to print.") return @@ -59,11 +59,11 @@ user.visible_message("\The [src] spits out a piece of paper.") return -/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob) +/obj/item/analyzer/plant_analyzer/attack_self(mob/user as mob) print_report(user) return 0 -/obj/item/device/analyzer/plant_analyzer/afterattack(obj/target, mob/user, flag) +/obj/item/analyzer/plant_analyzer/afterattack(obj/target, mob/user, flag) if(!flag) return var/datum/seed/grown_seed diff --git a/code/modules/integrated_electronics/_defines.dm b/code/modules/integrated_electronics/_defines.dm index aed16300e41..60f9eb72b15 100644 --- a/code/modules/integrated_electronics/_defines.dm +++ b/code/modules/integrated_electronics/_defines.dm @@ -46,7 +46,7 @@ icon = 'icons/obj/assemblies/electronic_components.dmi' icon_state = "template" w_class = WEIGHT_CLASS_TINY - var/obj/item/device/electronic_assembly/assembly // Reference to the assembly holding this circuit, if any. + var/obj/item/electronic_assembly/assembly // Reference to the assembly holding this circuit, if any. var/extended_desc var/list/inputs = list() var/list/inputs_default = list() // Assoc list which will fill a pin with data upon creation. e.g. "2" = 0 will set input pin 2 to equal 0 instead of null. diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 592e93df3a1..60737261a26 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -1,4 +1,4 @@ -/obj/item/device/electronic_assembly +/obj/item/electronic_assembly name = "electronic assembly" desc = "It's a case, for building small electronics with." w_class = WEIGHT_CLASS_SMALL @@ -15,7 +15,7 @@ var/detail_color = COLOR_ASSEMBLY_BLACK var/obj/item/card/id/access_card -/obj/item/device/electronic_assembly/implant +/obj/item/electronic_assembly/implant name = "electronic implant" icon_state = "setup_implant" desc = "It's a case, for building very tiny electronics with." @@ -24,20 +24,20 @@ max_complexity = IC_COMPLEXITY_BASE * 3/4 var/obj/item/implant/integrated_circuit/implant = null -/obj/item/device/electronic_assembly/Initialize(mapload, printed = FALSE) +/obj/item/electronic_assembly/Initialize(mapload, printed = FALSE) . = ..() if (!printed) battery = new(src) START_PROCESSING(SSelectronics, src) access_card = new /obj/item/card/id(src) -/obj/item/device/electronic_assembly/Destroy() +/obj/item/electronic_assembly/Destroy() QDEL_NULL(battery) STOP_PROCESSING(SSelectronics, src) QDEL_NULL(access_card) return ..() -/obj/item/device/electronic_assembly/Collide(atom/AM) +/obj/item/electronic_assembly/Collide(atom/AM) var/collw = AM .=..() if((istype(collw, /obj/machinery/door/airlock) || istype(collw, /obj/machinery/door/window)) && (!isnull(access_card))) @@ -45,10 +45,10 @@ if(D.check_access(access_card)) D.open() -/obj/item/device/electronic_assembly/process() +/obj/item/electronic_assembly/process() handle_idle_power() -/obj/item/device/electronic_assembly/proc/handle_idle_power() +/obj/item/electronic_assembly/proc/handle_idle_power() // First we generate power. for(var/obj/item/integrated_circuit/passive/power/P in contents) P.make_energy() @@ -58,25 +58,25 @@ if(IC.power_draw_idle && !draw_power(IC.power_draw_idle)) IC.power_fail() -/obj/item/device/electronic_assembly/implant/update_icon() +/obj/item/electronic_assembly/implant/update_icon() ..() implant.icon_state = icon_state -/obj/item/device/electronic_assembly/implant/ui_host() +/obj/item/electronic_assembly/implant/ui_host() return implant -/obj/item/device/electronic_assembly/proc/resolve_ui_host() +/obj/item/electronic_assembly/proc/resolve_ui_host() return src -/obj/item/device/electronic_assembly/implant/resolve_ui_host() +/obj/item/electronic_assembly/implant/resolve_ui_host() return implant -/obj/item/device/electronic_assembly/proc/check_interactivity(mob/user) +/obj/item/electronic_assembly/proc/check_interactivity(mob/user) if(!CanInteract(user, GLOB.physical_state)) return 0 return 1 -/obj/item/device/electronic_assembly/interact(mob/user) +/obj/item/electronic_assembly/interact(mob/user) if(!check_interactivity(user)) return @@ -125,7 +125,7 @@ B.set_content(HTML.Join()) B.open(FALSE) -/obj/item/device/electronic_assembly/Topic(href, href_list[]) +/obj/item/electronic_assembly/Topic(href, href_list[]) if(..()) return 1 if(!opened) @@ -147,7 +147,7 @@ interact(usr) // To refresh the UI. -/obj/item/device/electronic_assembly/verb/rename() +/obj/item/electronic_assembly/verb/rename() set name = "Rename Circuit" set category = "Object" set desc = "Rename your circuit, useful to stay organized." @@ -164,10 +164,10 @@ return input return null -/obj/item/device/electronic_assembly/proc/can_move() +/obj/item/electronic_assembly/proc/can_move() return FALSE -/obj/item/device/electronic_assembly/update_icon() +/obj/item/electronic_assembly/update_icon() if(opened) icon_state = "[initial(icon_state)]-open" else @@ -179,12 +179,12 @@ detail_overlay.color = detail_color AddOverlays(detail_overlay) -/obj/item/device/electronic_assembly/GetAccess() +/obj/item/electronic_assembly/GetAccess() . = list() for(var/obj/item/integrated_circuit/part in contents) . |= part.GetAccess() -/obj/item/device/electronic_assembly/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) +/obj/item/electronic_assembly/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(distance <= 1) for(var/obj/item/integrated_circuit/IC in contents) @@ -192,18 +192,18 @@ if(opened) interact(user) -/obj/item/device/electronic_assembly/proc/get_part_complexity() +/obj/item/electronic_assembly/proc/get_part_complexity() . = 0 for(var/obj/item/integrated_circuit/part in contents) . += part.complexity -/obj/item/device/electronic_assembly/proc/get_part_size() +/obj/item/electronic_assembly/proc/get_part_size() . = 0 for(var/obj/item/integrated_circuit/part in contents) . += part.size // Returns true if the circuit made it inside. -/obj/item/device/electronic_assembly/proc/add_circuit(obj/item/integrated_circuit/IC, mob/user) +/obj/item/electronic_assembly/proc/add_circuit(obj/item/integrated_circuit/IC, mob/user) if(!opened) to_chat(user, SPAN_WARNING("\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.")) return FALSE @@ -230,15 +230,15 @@ return TRUE // Non-interactive version of above that always succeeds, intended for build-in circuits that get added on assembly initialization. -/obj/item/device/electronic_assembly/proc/force_add_circuit(var/obj/item/integrated_circuit/IC) +/obj/item/electronic_assembly/proc/force_add_circuit(var/obj/item/integrated_circuit/IC) IC.forceMove(src) IC.assembly = src -/obj/item/device/electronic_assembly/afterattack(atom/target, mob/user, proximity) +/obj/item/electronic_assembly/afterattack(atom/target, mob/user, proximity) for(var/obj/item/integrated_circuit/input/sensor/S in contents) S.sense(target, user) -/obj/item/device/electronic_assembly/attackby(obj/item/attacking_item, mob/user) +/obj/item/electronic_assembly/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/integrated_circuit)) if(!user.unEquip(attacking_item)) return FALSE @@ -266,7 +266,7 @@ update_icon() return TRUE - else if(istype(attacking_item, /obj/item/device/integrated_electronics/wirer) || istype(attacking_item, /obj/item/device/integrated_electronics/debugger) || attacking_item.tool_behaviour == TOOL_MULTITOOL || attacking_item.tool_behaviour == TOOL_SCREWDRIVER) + else if(istype(attacking_item, /obj/item/integrated_electronics/wirer) || istype(attacking_item, /obj/item/integrated_electronics/debugger) || attacking_item.tool_behaviour == TOOL_MULTITOOL || attacking_item.tool_behaviour == TOOL_SCREWDRIVER) if(opened) interact(user) else @@ -295,8 +295,8 @@ to_chat(user, SPAN_NOTICE("You slot \the [cell] inside \the [src]'s power supply.")) interact(user) return TRUE - else if(istype(attacking_item, /obj/item/device/integrated_electronics/detailer)) - var/obj/item/device/integrated_electronics/detailer/D = attacking_item + else if(istype(attacking_item, /obj/item/integrated_electronics/detailer)) + var/obj/item/integrated_electronics/detailer/D = attacking_item detail_color = D.detail_color update_icon() return TRUE @@ -310,7 +310,7 @@ return TRUE return ..() -/obj/item/device/electronic_assembly/attack_self(mob/user) +/obj/item/electronic_assembly/attack_self(mob/user) if(!check_interactivity(user)) return if(opened) @@ -340,28 +340,28 @@ if(choice) choice.ask_for_input(user) -/obj/item/device/electronic_assembly/emp_act(severity) +/obj/item/electronic_assembly/emp_act(severity) . = ..() for(var/atom/movable/AM in contents) AM.emp_act(severity) // Returns true if power was successfully drawn. -/obj/item/device/electronic_assembly/proc/draw_power(amount) +/obj/item/electronic_assembly/proc/draw_power(amount) if(battery && battery.checked_use(amount * CELLRATE)) return TRUE return FALSE // Ditto for giving. -/obj/item/device/electronic_assembly/proc/give_power(amount) +/obj/item/electronic_assembly/proc/give_power(amount) if(battery && battery.give(amount * CELLRATE)) return TRUE return FALSE -/obj/item/device/electronic_assembly/proc/on_anchored() +/obj/item/electronic_assembly/proc/on_anchored() for(var/obj/item/integrated_circuit/IC in contents) IC.on_anchored() -/obj/item/device/electronic_assembly/proc/on_unanchored() +/obj/item/electronic_assembly/proc/on_unanchored() for(var/obj/item/integrated_circuit/IC in contents) IC.on_unanchored() diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm index 528789a4bf5..04b916da665 100644 --- a/code/modules/integrated_electronics/core/assemblies/clothing.dm +++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm @@ -3,7 +3,7 @@ // E.g. Glasses have less room than something worn over the chest. // Note that the electronic assembly is INSIDE the object that actually gets worn, in a similar way to implants. -/obj/item/device/electronic_assembly/clothing +/obj/item/electronic_assembly/clothing name = "electronic clothing" var/clothing_icon_state = "circuitry" // Needs to match the clothing's base icon_state. desc = "It's a case, for building machines attached to clothing." @@ -12,16 +12,16 @@ max_complexity = IC_COMPLEXITY_BASE var/obj/item/clothing/clothing = null -/obj/item/device/electronic_assembly/clothing/ui_host() +/obj/item/electronic_assembly/clothing/ui_host() return clothing -/obj/item/device/electronic_assembly/clothing/resolve_ui_host() +/obj/item/electronic_assembly/clothing/resolve_ui_host() return clothing -/obj/item/device/electronic_assembly/clothing/get_assembly_holder() +/obj/item/electronic_assembly/clothing/get_assembly_holder() return clothing -/obj/item/device/electronic_assembly/clothing/update_icon() +/obj/item/electronic_assembly/clothing/update_icon() clothing.icon_state = "[initial(clothing.icon_state)][opened ? "-open" : ""]" clothing.ClearOverlays() var/image/detail_overlay = image('icons/obj/assemblies/wearable_electronic_setups.dmi', "[initial(clothing.icon_state)][opened ? "-open" : ""]-color") @@ -30,25 +30,25 @@ clothing.update_clothing_icon() // This is 'small' relative to the size of regular clothing assemblies. -/obj/item/device/electronic_assembly/clothing/small +/obj/item/electronic_assembly/clothing/small max_components = IC_COMPONENTS_BASE / 2 max_complexity = IC_COMPLEXITY_BASE / 2 w_class = WEIGHT_CLASS_TINY // Ditto. -/obj/item/device/electronic_assembly/clothing/large +/obj/item/electronic_assembly/clothing/large max_components = IC_COMPONENTS_BASE * 2 max_complexity = IC_COMPLEXITY_BASE * 2 w_class = WEIGHT_CLASS_NORMAL -/obj/item/device/electronic_assembly/clothing/rename() +/obj/item/electronic_assembly/clothing/rename() var/input_name = ..() if(input_name) clothing.name = input_name // This is defined higher up, in /clothing to avoid lots of copypasta. /obj/item/clothing - var/obj/item/device/electronic_assembly/clothing/IC = null + var/obj/item/electronic_assembly/clothing/IC = null var/obj/item/integrated_circuit/built_in/action_button/action_circuit = null // This gets pulsed when someone clicks the button on the hud, OR when certain interactions are performed (such as clicking on something with gloves worn) /obj/item/clothing/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) @@ -91,7 +91,7 @@ worn_state = "jumpsuit" /obj/item/clothing/under/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing) return ..() /obj/item/clothing/under/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) @@ -114,7 +114,7 @@ item_state = "gloves" /obj/item/clothing/gloves/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/small) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() /obj/item/clothing/gloves/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) @@ -147,7 +147,7 @@ item_state = "goggles" /obj/item/clothing/glasses/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/small) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() /obj/item/clothing/glasses/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) @@ -185,7 +185,7 @@ item_state = "shoes" /obj/item/clothing/shoes/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/small) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() /obj/item/clothing/shoes/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) @@ -208,7 +208,7 @@ item_state = "head" /obj/item/clothing/head/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/small) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() /obj/item/clothing/head/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) @@ -230,7 +230,7 @@ item_state = "headset" /obj/item/clothing/ears/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/small) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() /obj/item/clothing/ears/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) @@ -253,7 +253,7 @@ item_state = "chest" /obj/item/clothing/suit/circuitry/Initialize() - setup_integrated_circuit(/obj/item/device/electronic_assembly/clothing/large) + setup_integrated_circuit(/obj/item/electronic_assembly/clothing/large) return ..() /obj/item/clothing/suit/circuitry/build_additional_parts(mob/living/carbon/human/H, mob_icon, slot) diff --git a/code/modules/integrated_electronics/core/assemblies/generic.dm b/code/modules/integrated_electronics/core/assemblies/generic.dm index f1c100b13ec..45b52f25a7e 100644 --- a/code/modules/integrated_electronics/core/assemblies/generic.dm +++ b/code/modules/integrated_electronics/core/assemblies/generic.dm @@ -2,37 +2,37 @@ // Small assemblies. -/obj/item/device/electronic_assembly/default +/obj/item/electronic_assembly/default name = "type-a electronic assembly" -/obj/item/device/electronic_assembly/calc +/obj/item/electronic_assembly/calc name = "type-b electronic assembly" icon_state = "setup_small_calc" desc = "It's a case, for building small electronics with. This one resembles a pocket calculator." -/obj/item/device/electronic_assembly/clam +/obj/item/electronic_assembly/clam name = "type-c electronic assembly" icon_state = "setup_small_clam" desc = "It's a case, for building small electronics with. This one has a clamshell design." -/obj/item/device/electronic_assembly/simple +/obj/item/electronic_assembly/simple name = "type-d electronic assembly" icon_state = "setup_small_simple" desc = "It's a case, for building small electronics with. This one has a simple design." -/obj/item/device/electronic_assembly/hook +/obj/item/electronic_assembly/hook name = "type-e electronic assembly" icon_state = "setup_small_hook" desc = "It's a case, for building small electronics with. This one looks like it has a belt clip, but it's purely decorative." -/obj/item/device/electronic_assembly/pda +/obj/item/electronic_assembly/pda name = "type-f electronic assembly" icon_state = "setup_small_pda" desc = "It's a case, for building small electronics with. This one resembles a PDA." // Tiny assemblies. -/obj/item/device/electronic_assembly/tiny +/obj/item/electronic_assembly/tiny name = "electronic device" icon_state = "setup_device" desc = "It's a case, for building tiny-sized electronics with." @@ -40,32 +40,32 @@ max_components = IC_COMPONENTS_BASE / 2 max_complexity = IC_COMPLEXITY_BASE / 2 -/obj/item/device/electronic_assembly/tiny/default +/obj/item/electronic_assembly/tiny/default name = "type-a electronic device" -/obj/item/device/electronic_assembly/tiny/cylinder +/obj/item/electronic_assembly/tiny/cylinder name = "type-b electronic device" icon_state = "setup_device_cylinder" desc = "It's a case, for building tiny-sized electronics with. This one has a cylindrical design." -/obj/item/device/electronic_assembly/tiny/scanner +/obj/item/electronic_assembly/tiny/scanner name = "type-c electronic device" icon_state = "setup_device_scanner" desc = "It's a case, for building tiny-sized electronics with. This one has a scanner-like design." -/obj/item/device/electronic_assembly/tiny/hook +/obj/item/electronic_assembly/tiny/hook name = "type-d electronic device" icon_state = "setup_device_hook" desc = "It's a case, for building tiny-sized electronics with. This one looks like it has a belt clip, but it's purely decorative." -/obj/item/device/electronic_assembly/tiny/box +/obj/item/electronic_assembly/tiny/box name = "type-e electronic device" icon_state = "setup_device_box" desc = "It's a case, for building tiny-sized electronics with. This one has a boxy design." // Medium assemblies. -/obj/item/device/electronic_assembly/medium +/obj/item/electronic_assembly/medium name = "electronic mechanism" icon_state = "setup_medium" desc = "It's a case, for building medium-sized electronics with." @@ -73,39 +73,39 @@ max_components = IC_COMPONENTS_BASE * 2 max_complexity = IC_COMPLEXITY_BASE * 2 -/obj/item/device/electronic_assembly/medium/default +/obj/item/electronic_assembly/medium/default name = "type-a electronic mechanism" -/obj/item/device/electronic_assembly/medium/box +/obj/item/electronic_assembly/medium/box name = "type-b electronic mechanism" icon_state = "setup_medium_box" desc = "It's a case, for building medium-sized electronics with. This one has a boxy design." -/obj/item/device/electronic_assembly/medium/clam +/obj/item/electronic_assembly/medium/clam name = "type-c electronic mechanism" icon_state = "setup_medium_clam" desc = "It's a case, for building medium-sized electronics with. This one has a clamshell design." -/obj/item/device/electronic_assembly/medium/medical +/obj/item/electronic_assembly/medium/medical name = "type-d electronic mechanism" icon_state = "setup_medium_med" desc = "It's a case, for building medium-sized electronics with. This one resembles some type of medical apparatus." -/obj/item/device/electronic_assembly/medium/gun +/obj/item/electronic_assembly/medium/gun name = "type-e electronic mechanism" icon_state = "setup_medium_gun" item_state = "circuitgun" desc = "It's a case, for building medium-sized electronics with. This one resembles a gun, or some type of tool, \ if you're feeling optimistic." -/obj/item/device/electronic_assembly/medium/radio +/obj/item/electronic_assembly/medium/radio name = "type-f electronic mechanism" icon_state = "setup_medium_radio" desc = "It's a case, for building medium-sized electronics with. This one resembles an old radio." // Large assemblies. -/obj/item/device/electronic_assembly/large +/obj/item/electronic_assembly/large name = "electronic machine" icon_state = "setup_large" desc = "It's a case, for building large electronics with." @@ -114,37 +114,37 @@ max_complexity = IC_COMPLEXITY_BASE * 4 can_anchor = TRUE -/obj/item/device/electronic_assembly/large/default +/obj/item/electronic_assembly/large/default name = "type-a electronic machine" -/obj/item/device/electronic_assembly/large/scope +/obj/item/electronic_assembly/large/scope name = "type-b electronic machine" icon_state = "setup_large_scope" desc = "It's a case, for building large electronics with. This one resembles an oscilloscope." -/obj/item/device/electronic_assembly/large/terminal +/obj/item/electronic_assembly/large/terminal name = "type-c electronic machine" icon_state = "setup_large_terminal" desc = "It's a case, for building large electronics with. This one resembles a computer terminal." -/obj/item/device/electronic_assembly/large/arm +/obj/item/electronic_assembly/large/arm name = "type-d electronic machine" icon_state = "setup_large_arm" desc = "It's a case, for building large electronics with. This one resembles a robotic arm." -/obj/item/device/electronic_assembly/large/tall +/obj/item/electronic_assembly/large/tall name = "type-e electronic machine" icon_state = "setup_large_tall" desc = "It's a case, for building large electronics with. This one has a tall design." -/obj/item/device/electronic_assembly/large/industrial +/obj/item/electronic_assembly/large/industrial name = "type-f electronic machine" icon_state = "setup_large_industrial" desc = "It's a case, for building large electronics with. This one resembles some kind of industrial machinery." // Drone assemblies, which can move with the locomotion circuit. -/obj/item/device/electronic_assembly/drone +/obj/item/electronic_assembly/drone name = "electronic drone" icon_state = "setup_drone" desc = "It's a case, for building mobile electronics with." @@ -153,35 +153,35 @@ max_complexity = IC_COMPLEXITY_BASE * 1.5 can_anchor = FALSE -/obj/item/device/electronic_assembly/drone/can_move() +/obj/item/electronic_assembly/drone/can_move() return TRUE -/obj/item/device/electronic_assembly/drone/default +/obj/item/electronic_assembly/drone/default name = "type-a electronic drone" -/obj/item/device/electronic_assembly/drone/arms +/obj/item/electronic_assembly/drone/arms name = "type-b electronic drone" icon_state = "setup_drone_arms" desc = "It's a case, for building mobile electronics with. This one is armed and dangerous." -/obj/item/device/electronic_assembly/drone/medbot +/obj/item/electronic_assembly/drone/medbot name = "type-d electronic drone" icon_state = "setup_drone_medbot" desc = "It's a case, for building mobile electronics with. This one resembles a Medibot." -/obj/item/device/electronic_assembly/drone/genbot +/obj/item/electronic_assembly/drone/genbot name = "type-e electronic drone" icon_state = "setup_drone_genbot" desc = "It's a case, for building mobile electronics with. This one has a generic bot design." -/obj/item/device/electronic_assembly/drone/android +/obj/item/electronic_assembly/drone/android name = "type-f electronic drone" icon_state = "setup_drone_android" desc = "It's a case, for building mobile electronics with. This one has a hominoid design." // Wall mounted assemblies. -/obj/item/device/electronic_assembly/wallmount +/obj/item/electronic_assembly/wallmount name = "wall-mounted electronic assembly" icon_state = "setup_wallmount_medium" desc = "It's a case, for building medium-sized electronics with. It has a magnetized \ @@ -191,7 +191,7 @@ max_complexity = IC_COMPLEXITY_BASE * 2 can_anchor = TRUE -/obj/item/device/electronic_assembly/wallmount/proc/mount_assembly(turf/on_wall, mob/user) +/obj/item/electronic_assembly/wallmount/proc/mount_assembly(turf/on_wall, mob/user) if(get_dist(on_wall,user) > 1) return var/ndir = get_dir(on_wall, user) @@ -212,16 +212,16 @@ on_anchored() set_pixel_offsets() -/obj/item/device/electronic_assembly/wallmount/on_unanchored() +/obj/item/electronic_assembly/wallmount/on_unanchored() pixel_x = 0 pixel_y = 0 ..() -/obj/item/device/electronic_assembly/wallmount/set_pixel_offsets() +/obj/item/electronic_assembly/wallmount/set_pixel_offsets() pixel_x = DIR2PIXEL_X(dir) pixel_y = DIR2PIXEL_Y(dir) -/obj/item/device/electronic_assembly/wallmount/heavy +/obj/item/electronic_assembly/wallmount/heavy name = "heavy wall-mounted electronic assembly" icon_state = "setup_wallmount_large" desc = "It's a case, for building large electronics with. It has a magnetized backing \ @@ -230,7 +230,7 @@ max_components = IC_COMPONENTS_BASE * 4 max_complexity = IC_COMPLEXITY_BASE * 4 -/obj/item/device/electronic_assembly/wallmount/light +/obj/item/electronic_assembly/wallmount/light name = "light wall-mounted electronic assembly" icon_state = "setup_wallmount_small" desc = "It's a case, for building small electronics with. It has a magnetized backing \ @@ -239,7 +239,7 @@ max_components = IC_COMPONENTS_BASE max_complexity = IC_COMPLEXITY_BASE -/obj/item/device/electronic_assembly/wallmount/tiny +/obj/item/electronic_assembly/wallmount/tiny name = "tiny wall-mounted electronic assembly" icon_state = "setup_wallmount_tiny" desc = "It's a case, for building tiny electronics with. It has a magnetized backing \ @@ -248,5 +248,5 @@ max_components = IC_COMPONENTS_BASE / 2 max_complexity = IC_COMPLEXITY_BASE / 2 -/obj/item/device/electronic_assembly/proc/get_assembly_holder() +/obj/item/electronic_assembly/proc/get_assembly_holder() return src diff --git a/code/modules/integrated_electronics/core/device.dm b/code/modules/integrated_electronics/core/device.dm index b6ee1edb33e..e6f53e9e4b2 100644 --- a/code/modules/integrated_electronics/core/device.dm +++ b/code/modules/integrated_electronics/core/device.dm @@ -1,23 +1,23 @@ -/obj/item/device/assembly/electronic_assembly +/obj/item/assembly/electronic_assembly name = "electronic device" desc = "It's a case for building electronics with. It can be attached to other small devices." icon_state = "setup_device" var/opened = 0 - var/obj/item/device/electronic_assembly/device/EA + var/obj/item/electronic_assembly/device/EA -/obj/item/device/assembly/electronic_assembly/Initialize() +/obj/item/assembly/electronic_assembly/Initialize() . = ..() EA = new(src) EA.holder = src -/obj/item/device/assembly/electronic_assembly/Destroy() +/obj/item/assembly/electronic_assembly/Destroy() EA.holder = null QDEL_NULL(EA) . = ..() -/obj/item/device/assembly/electronic_assembly/attackby(obj/item/attacking_item, mob/user) +/obj/item/assembly/electronic_assembly/attackby(obj/item/attacking_item, mob/user) if (attacking_item.tool_behaviour == TOOL_CROWBAR) toggle_open(user) else if (opened) @@ -25,7 +25,7 @@ else ..() -/obj/item/device/assembly/electronic_assembly/proc/toggle_open(mob/user) +/obj/item/assembly/electronic_assembly/proc/toggle_open(mob/user) playsound(get_turf(src), 'sound/items/crowbar_pry.ogg', 50, 1) opened = !opened EA.opened = opened @@ -33,7 +33,7 @@ secured = 1 update_icon() -/obj/item/device/assembly/electronic_assembly/update_icon() +/obj/item/assembly/electronic_assembly/update_icon() if(EA) icon_state = initial(icon_state) else @@ -41,23 +41,23 @@ if(opened) icon_state = "[icon_state]-open" -/obj/item/device/assembly/electronic_assembly/attack_self(mob/user as mob) +/obj/item/assembly/electronic_assembly/attack_self(mob/user as mob) if(EA) EA.attack_self(user) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs -/obj/item/device/assembly/electronic_assembly/pulsed(radio = 0) +/obj/item/assembly/electronic_assembly/pulsed(radio = 0) if(EA) for(var/obj/item/integrated_circuit/built_in/device_input/I in EA.contents) I.do_work() -/obj/item/device/assembly/electronic_assembly/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) +/obj/item/assembly/electronic_assembly/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(EA) for(var/obj/item/integrated_circuit/IC in EA.contents) IC.external_examine(user) -/obj/item/device/assembly/electronic_assembly/verb/toggle() +/obj/item/assembly/electronic_assembly/verb/toggle() set src in usr set category = "Object" set name = "Open/Close Device Assembly" @@ -65,7 +65,7 @@ toggle_open(usr) -/obj/item/device/electronic_assembly/device +/obj/item/electronic_assembly/device name = "electronic device" icon_state = "setup_device" desc = "It's a tiny electronic device with specific use for attaching to other devices." @@ -73,12 +73,12 @@ max_components = IC_COMPONENTS_BASE * 3/4 max_complexity = IC_COMPLEXITY_BASE * 3/4 - var/obj/item/device/assembly/electronic_assembly/holder + var/obj/item/assembly/electronic_assembly/holder var/obj/item/integrated_circuit/built_in/device_input/input var/obj/item/integrated_circuit/built_in/device_output/output -/obj/item/device/electronic_assembly/device/Initialize() +/obj/item/electronic_assembly/device/Initialize() . = ..() src.input = new(src) @@ -87,7 +87,7 @@ src.input.assembly = src src.output.assembly = src -/obj/item/device/electronic_assembly/device/Destroy() +/obj/item/electronic_assembly/device/Destroy() src.holder = null src.input.assembly = null @@ -98,7 +98,7 @@ . = ..() -/obj/item/device/electronic_assembly/device/check_interactivity(mob/user) +/obj/item/electronic_assembly/device/check_interactivity(mob/user) if(!CanInteract(user, state = GLOB.deep_inventory_state)) return 0 return 1 diff --git a/code/modules/integrated_electronics/core/helpers.dm b/code/modules/integrated_electronics/core/helpers.dm index 9822d5e88e0..66fb065ff4e 100644 --- a/code/modules/integrated_electronics/core/helpers.dm +++ b/code/modules/integrated_electronics/core/helpers.dm @@ -60,15 +60,15 @@ return activators[pin_number] return null -/obj/item/integrated_circuit/proc/handle_wire(datum/integrated_io/pin, obj/item/device/integrated_electronics/tool) - if(istype(tool, /obj/item/device/integrated_electronics/wirer)) - var/obj/item/device/integrated_electronics/wirer/wirer = tool +/obj/item/integrated_circuit/proc/handle_wire(datum/integrated_io/pin, obj/item/integrated_electronics/tool) + if(istype(tool, /obj/item/integrated_electronics/wirer)) + var/obj/item/integrated_electronics/wirer/wirer = tool if(pin) wirer.wire(pin, usr) return 1 - else if(istype(tool, /obj/item/device/integrated_electronics/debugger)) - var/obj/item/device/integrated_electronics/debugger/debugger = tool + else if(istype(tool, /obj/item/integrated_electronics/debugger)) + var/obj/item/integrated_electronics/debugger/debugger = tool if(pin) debugger.write_data(pin, usr) return 1 diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 5432e0993e3..8a589d1e25e 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -49,8 +49,8 @@ a creative player the means to solve many problems. Circuits are held inside an . = ..() /obj/item/integrated_circuit/ui_host() - if(istype(src.loc, /obj/item/device/electronic_assembly)) - var/obj/item/device/electronic_assembly/assembly = loc + if(istype(src.loc, /obj/item/electronic_assembly)) + var/obj/item/electronic_assembly/assembly = loc return assembly.resolve_ui_host() return ..() @@ -191,7 +191,7 @@ a creative player the means to solve many problems. Circuits are held inside an return 1 var/update = 1 - var/obj/item/device/electronic_assembly/A = src.assembly + var/obj/item/electronic_assembly/A = src.assembly var/update_to_assembly = 0 var/datum/integrated_io/pin = locate(href_list["pin"]) in inputs + outputs + activators var/datum/integrated_io/linked = null @@ -200,7 +200,7 @@ a creative player the means to solve many problems. Circuits are held inside an var/obj/item/held_item = usr.get_active_hand() var/obj/item/off_hand = usr.get_inactive_hand() - var/obj/item/device/multitool/M + var/obj/item/multitool/M if(held_item?.tool_behaviour == TOOL_MULTITOOL) M = held_item if(!M && off_hand?.tool_behaviour == TOOL_MULTITOOL) @@ -213,7 +213,7 @@ a creative player the means to solve many problems. Circuits are held inside an rename_component(usr) if(href_list["from_assembly"]) update = 0 - var/obj/item/device/electronic_assembly/ea = loc + var/obj/item/electronic_assembly/ea = loc if(istype(ea)) ea.interact(usr) @@ -237,15 +237,15 @@ a creative player the means to solve many problems. Circuits are held inside an M.unwire(pin, linked, usr) if(href_list["wire"]) - if(istype(held_item, /obj/item/device/integrated_electronics/wirer)) - var/obj/item/device/integrated_electronics/wirer/wirer = held_item + if(istype(held_item, /obj/item/integrated_electronics/wirer)) + var/obj/item/integrated_electronics/wirer/wirer = held_item if(linked) wirer.wire(linked, usr) else if(pin) wirer.wire(pin, usr) - else if(istype(held_item, /obj/item/device/integrated_electronics/debugger)) - var/obj/item/device/integrated_electronics/debugger/debugger = held_item + else if(istype(held_item, /obj/item/integrated_electronics/debugger)) + var/obj/item/integrated_electronics/debugger/debugger = held_item if(pin) debugger.write_data(pin, usr) else @@ -271,8 +271,8 @@ a creative player the means to solve many problems. Circuits are held inside an update_to_assembly = 1 if(href_list["scan"]) - if(istype(held_item, /obj/item/device/integrated_electronics/debugger)) - var/obj/item/device/integrated_electronics/debugger/D = held_item + if(istype(held_item, /obj/item/integrated_electronics/debugger)) + var/obj/item/integrated_electronics/debugger/D = held_item if(D.accepting_refs) D.afterattack(src, usr, TRUE) else @@ -294,7 +294,7 @@ a creative player the means to solve many problems. Circuits are held inside an if(!removable) to_chat(usr, SPAN_WARNING("\The [src] seems to be permanently attached to the case.")) return - var/obj/item/device/electronic_assembly/ea = loc + var/obj/item/electronic_assembly/ea = loc disconnect_all() var/turf/T = get_turf(src) forceMove(T) diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index ee68183e5a6..dbb75eeba90 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -1,4 +1,4 @@ -/obj/item/device/integrated_circuit_printer +/obj/item/integrated_circuit_printer name = "integrated circuit printer" desc = "A portable(ish) machine made to print tiny modular circuitry out of metal." icon = 'icons/obj/assemblies/electronic_tools.dmi' @@ -10,13 +10,13 @@ var/upgraded = FALSE // When hit with an upgrade disk, will turn true, allowing it to print the higher tier circuits. var/can_clone = FALSE // Same for above, but will allow the printer to duplicate a specific assembly. - var/obj/item/device/electronic_assembly/assembly_to_clone + var/obj/item/electronic_assembly/assembly_to_clone -/obj/item/device/integrated_circuit_printer/upgraded +/obj/item/integrated_circuit_printer/upgraded upgraded = TRUE can_clone = TRUE -/obj/item/device/integrated_circuit_printer/attackby(obj/item/attacking_item, mob/user) +/obj/item/integrated_circuit_printer/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item,/obj/item/stack/material)) var/obj/item/stack/material/stack = attacking_item if(stack.material.name == DEFAULT_WALL_MATERIAL) @@ -54,16 +54,16 @@ return ..() -/obj/item/device/integrated_circuit_printer/attack_self(var/mob/user) +/obj/item/integrated_circuit_printer/attack_self(var/mob/user) ui_interact(user) -/obj/item/device/integrated_circuit_printer/ui_interact(mob/user, datum/tgui/ui) +/obj/item/integrated_circuit_printer/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "CircuitPrinter", "Integrated Circuit Printer", 600, 500) ui.open() -/obj/item/device/integrated_circuit_printer/ui_data(mob/user) +/obj/item/integrated_circuit_printer/ui_data(mob/user) var/list/data = list() data["metal"] = metal / metal_per_sheet @@ -81,7 +81,7 @@ return data -/obj/item/device/integrated_circuit_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/integrated_circuit_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -99,8 +99,8 @@ var/cost = 1 var/is_asm = FALSE - if(ispath(build_type, /obj/item/device/electronic_assembly)) - var/obj/item/device/electronic_assembly/E = build_type + if(ispath(build_type, /obj/item/electronic_assembly)) + var/obj/item/electronic_assembly/E = build_type cost = round( (initial(E.max_complexity) + initial(E.max_components) ) / 4) is_asm = TRUE else if(ispath(build_type, /obj/item/integrated_circuit)) @@ -117,7 +117,7 @@ new build_type(get_turf(loc)) . = TRUE -/obj/item/device/integrated_circuit_printer/proc/can_print(build_type) +/obj/item/integrated_circuit_printer/proc/can_print(build_type) for(var/category in SSelectronics.printer_recipe_list) var/list/current_list = SSelectronics.printer_recipe_list[category] diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index a0828b5be74..0760693b83d 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -3,7 +3,7 @@ #define UNWIRE "unwire" #define UNWIRING "unwiring" -/obj/item/device/integrated_electronics/wirer +/obj/item/integrated_electronics/wirer name = "circuit wirer" desc = "It's a small wiring tool, with a wire roll, electric soldering iron, wire cutter, and more in one package. \ The wires used are generally useful for small electronics, such as circuitboards and breadboards, as opposed to larger wires \ @@ -16,10 +16,10 @@ var/datum/integrated_io/selected_io var/mode = WIRE -/obj/item/device/integrated_electronics/wirer/update_icon() +/obj/item/integrated_electronics/wirer/update_icon() icon_state = "wirer-[mode]" -/obj/item/device/integrated_electronics/wirer/proc/wire(var/datum/integrated_io/io, mob/user) +/obj/item/integrated_electronics/wirer/proc/wire(var/datum/integrated_io/io, mob/user) if(!io.holder.assembly) to_chat(user, SPAN_WARNING("\The [io.holder] needs to be secured inside an assembly first.")) return @@ -82,7 +82,7 @@ [io.name] are not connected.")) -/obj/item/device/integrated_electronics/wirer/attack_self(mob/user) +/obj/item/integrated_electronics/wirer/attack_self(mob/user) switch(mode) if(WIRE) mode = UNWIRE @@ -106,7 +106,7 @@ #undef UNWIRE #undef UNWIRING -/obj/item/device/integrated_electronics/debugger +/obj/item/integrated_electronics/debugger name = "circuit debugger" desc = "This small tool allows one working with custom machinery to directly set data to a specific pin, useful for writing \ settings to specific circuits, or for debugging purposes. It can also pulse activation pins." @@ -118,7 +118,7 @@ var/data_to_write = null var/accepting_refs = 0 -/obj/item/device/integrated_electronics/debugger/attack_self(mob/user) +/obj/item/integrated_electronics/debugger/attack_self(mob/user) var/type_to_use = input("Please choose a type to use.","[src] type setting") as null|anything in list("string","number","ref", "null") if(!CanInteract(user, GLOB.physical_state)) return @@ -145,7 +145,7 @@ data_to_write = null to_chat(user, SPAN_NOTICE("You set \the [src]'s memory to absolutely nothing.")) -/obj/item/device/integrated_electronics/debugger/afterattack(atom/target, mob/living/user, proximity) +/obj/item/integrated_electronics/debugger/afterattack(atom/target, mob/living/user, proximity) if(accepting_refs && proximity) data_to_write = WEAKREF(target) visible_message(SPAN_NOTICE("[user] slides [src]'s ref scanner over \the [target].")) @@ -153,7 +153,7 @@ now off.") accepting_refs = 0 -/obj/item/device/integrated_electronics/debugger/proc/write_data(var/datum/integrated_io/io, mob/user) +/obj/item/integrated_electronics/debugger/proc/write_data(var/datum/integrated_io/io, mob/user) switch (io.io_type) if (DATA_CHANNEL) io.write_data_to_pin(data_to_write) @@ -169,7 +169,7 @@ io.holder.interact(user) // This is to update the UI. -/obj/item/device/integrated_electronics/detailer +/obj/item/integrated_electronics/detailer name = "assembly detailer" desc = "A combination autopainter and flash anodizer designed to give electronic assemblies a colorful, wear-resistant finish." icon = 'icons/obj/assemblies/electronic_tools.dmi' @@ -196,17 +196,17 @@ "hot pink" = COLOR_ASSEMBLY_HOT_PINK ) -/obj/item/device/integrated_electronics/detailer/Initialize() +/obj/item/integrated_electronics/detailer/Initialize() update_icon() return ..() -/obj/item/device/integrated_electronics/detailer/update_icon() +/obj/item/integrated_electronics/detailer/update_icon() ClearOverlays() var/image/detail_overlay = image('icons/obj/assemblies/electronic_tools.dmi', "detailer-color") detail_overlay.color = detail_color AddOverlays(detail_overlay) -/obj/item/device/integrated_electronics/detailer/attack_self(mob/user) +/obj/item/integrated_electronics/detailer/attack_self(mob/user) var/color_choice = input(user, "Select color.", "Assembly Detailer", detail_color) as null|anything in color_list if(!color_choice) return @@ -225,11 +225,11 @@ can_hold = list( /obj/item/integrated_circuit, /obj/item/storage/bag/circuits/mini, - /obj/item/device/electronic_assembly, - /obj/item/device/integrated_electronics, + /obj/item/electronic_assembly, + /obj/item/integrated_electronics, /obj/item/crowbar, /obj/item/screwdriver, - /obj/item/device/multitool + /obj/item/multitool ) make_exact_fit = TRUE @@ -246,10 +246,10 @@ new /obj/item/storage/bag/circuits/mini/converter(src) new /obj/item/storage/bag/circuits/mini/power(src) - new /obj/item/device/electronic_assembly(src) - new /obj/item/device/assembly/electronic_assembly(src) - new /obj/item/device/assembly/electronic_assembly(src) - new /obj/item/device/multitool(src) + new /obj/item/electronic_assembly(src) + new /obj/item/assembly/electronic_assembly(src) + new /obj/item/assembly/electronic_assembly(src) + new /obj/item/multitool(src) new /obj/item/screwdriver(src) new /obj/item/crowbar(src) @@ -269,12 +269,12 @@ new /obj/item/storage/bag/circuits/mini/converter/all(src) new /obj/item/storage/bag/circuits/mini/power/all(src) - new /obj/item/device/electronic_assembly(src) - new /obj/item/device/electronic_assembly/medium(src) - new /obj/item/device/electronic_assembly/large(src) - new /obj/item/device/electronic_assembly/drone(src) - new /obj/item/device/integrated_electronics/wirer(src) - new /obj/item/device/integrated_electronics/debugger(src) + new /obj/item/electronic_assembly(src) + new /obj/item/electronic_assembly/medium(src) + new /obj/item/electronic_assembly/large(src) + new /obj/item/electronic_assembly/drone(src) + new /obj/item/integrated_electronics/wirer(src) + new /obj/item/integrated_electronics/debugger(src) new /obj/item/crowbar(src) /obj/item/storage/bag/circuits/mini diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 6ab46e41f1c..a42608816f3 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -86,8 +86,8 @@ /obj/item/integrated_circuit/passive/power/metabolic_siphon/make_energy() var/mob/living/carbon/human/host - if(assembly && istype(assembly, /obj/item/device/electronic_assembly/implant)) - var/obj/item/device/electronic_assembly/implant/implant_assembly = assembly + if(assembly && istype(assembly, /obj/item/electronic_assembly/implant)) + var/obj/item/electronic_assembly/implant/implant_assembly = assembly if(implant_assembly.implant.imp_in) host = implant_assembly.implant.imp_in if(!get_pin_data(IC_INPUT, 1)) diff --git a/code/modules/integrated_electronics/subtypes/built_in.dm b/code/modules/integrated_electronics/subtypes/built_in.dm index 794b0bc80dd..702e1d4e112 100644 --- a/code/modules/integrated_electronics/subtypes/built_in.dm +++ b/code/modules/integrated_electronics/subtypes/built_in.dm @@ -23,8 +23,8 @@ activators = list("pulse attached" = IC_PINTYPE_PULSE_IN) /obj/item/integrated_circuit/built_in/device_output/do_work() - if(istype(assembly, /obj/item/device/electronic_assembly/device)) - var/obj/item/device/electronic_assembly/device/device = assembly + if(istype(assembly, /obj/item/electronic_assembly/device)) + var/obj/item/electronic_assembly/device/device = assembly device.holder.pulse() // Triggered when clothing assembly's hud button is clicked, used in-hand, or when another clothing-specific interaction occurs (like touching something with gloves on). diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 5c2c0fb3aff..ab60a3a13db 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -406,7 +406,7 @@ name = "global positioning system" desc = "This allows you to easily know the position of a machine containing this device." extended_desc = "The GPS's coordinates it gives is absolute, not relative." - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps" item_state = "radio" contained_sprite = TRUE diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index 21311c61439..8fcc9df47ec 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -566,35 +566,35 @@ var/list/worths = list( /obj/item/clothing/under/space = 40, /obj/item/clothing = 5, //DEVICES, - /obj/item/device/magnetic_lock = 70, - /obj/item/device/wormhole_jaunter = 50, - /obj/item/device/soulstone = 1000, - /obj/item/device/dociler = 45, - /obj/item/device/mmi = 120, - /obj/item/device/kit = 10, + /obj/item/magnetic_lock = 70, + /obj/item/wormhole_jaunter = 50, + /obj/item/soulstone = 1000, + /obj/item/dociler = 45, + /obj/item/mmi = 120, + /obj/item/kit = 10, /obj/item/aicard = 600, - /obj/item/device/chameleon = 400, - /obj/item/device/paicard = 12, - /obj/item/device/powersink = 180, + /obj/item/chameleon = 400, + /obj/item/paicard = 12, + /obj/item/powersink = 180, /obj/item/hand_tele = 180, - /obj/item/device/mass_spectrometer/adv = 40, - /obj/item/device/mass_spectrometer = 30, - /obj/item/device/reagent_scanner/adv = 60, - /obj/item/device/reagent_scanner = 50, - /obj/item/device/slime_scanner = 30, - /obj/item/device/transfer_valve = 5, - /obj/item/device/synthesized_instrument/violin = 25, - /obj/item/device/radio = 15, - /obj/item/device/assembly/igniter = 15, - /obj/item/device/assembly/infra = 1, - /obj/item/device/assembly/mousetrap = 5, - /obj/item/device/assembly/signaler = 3, - /obj/item/device/assembly = 5, - /obj/item/device/uv_light = 15, - /obj/item/device/eftpos = 3, + /obj/item/mass_spectrometer/adv = 40, + /obj/item/mass_spectrometer = 30, + /obj/item/reagent_scanner/adv = 60, + /obj/item/reagent_scanner = 50, + /obj/item/slime_scanner = 30, + /obj/item/transfer_valve = 5, + /obj/item/synthesized_instrument/violin = 25, + /obj/item/radio = 15, + /obj/item/assembly/igniter = 15, + /obj/item/assembly/infra = 1, + /obj/item/assembly/mousetrap = 5, + /obj/item/assembly/signaler = 3, + /obj/item/assembly = 5, + /obj/item/uv_light = 15, + /obj/item/eftpos = 3, /obj/item/device = 9, - /obj/item/device/synthesized_instrument/guitar = 20, - /obj/item/device/synthesized_instrument/trumpet = 30, + /obj/item/synthesized_instrument/guitar = 20, + /obj/item/synthesized_instrument/trumpet = 30, //ORGANS, /obj/item/organ/internal/heart = 120, /obj/item/organ/internal/brain/golem = 300, diff --git a/code/modules/makeshift/makeshift_reagents.dm b/code/modules/makeshift/makeshift_reagents.dm index 97a60f7241f..8c6c59af1f8 100644 --- a/code/modules/makeshift/makeshift_reagents.dm +++ b/code/modules/makeshift/makeshift_reagents.dm @@ -7,7 +7,7 @@ anchored = TRUE pass_flags_self = PASSSTRUCTURE | LETPASSTHROW - var/obj/item/device/analyzer/analyzer + var/obj/item/analyzer/analyzer var/transfer_out = 0 var/phase_filter @@ -66,7 +66,7 @@ joules = 1000 // 1 kJ per match, and we're assuming lighters give as much per use else if(W.tool_behaviour == TOOL_WELDER) joules = 10000 // we'll just have it be ten times stronger - else if(istype(W, /obj/item/device/assembly/igniter)) + else if(istype(W, /obj/item/assembly/igniter)) joules = 5000 // half as strong as a welder; this thing has to set off bombs and such else joules = 500 // we're assuming it's some kind of novelty toy like lunea's gloves, etc; not exactly a match but it still works @@ -157,7 +157,7 @@ return chop(chopped, user) return - if(!analyzer && istype(attacking_item, /obj/item/device/analyzer)) + if(!analyzer && istype(attacking_item, /obj/item/analyzer)) user.drop_from_inventory(attacking_item) analyzer = attacking_item attacking_item.forceMove(src) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 30a642cc256..378b068de23 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(minevendor_list, list( new /datum/data/mining_equipment(/obj/item/stack/flag/purple, 10, 50), new /datum/data/mining_equipment(/obj/item/storage/bag/ore, 25, 50), new /datum/data/mining_equipment(pick(subtypesof(/obj/item/pizzabox)), 2, 50), - new /datum/data/mining_equipment(/obj/item/device/flashlight/lantern, 10, 75), + new /datum/data/mining_equipment(/obj/item/flashlight/lantern, 10, 75), new /datum/data/mining_equipment(/obj/item/shovel, 15, 100), new /datum/data/mining_equipment(/obj/item/pickaxe, 10, 100), new /datum/data/mining_equipment(/obj/item/rfd_ammo, 50, 100), @@ -35,32 +35,32 @@ GLOBAL_LIST_INIT(minevendor_list, list( new /datum/data/mining_equipment(/obj/item/gun/custom_ka/frame02/prebuilt, 12, 400), new /datum/data/mining_equipment(/obj/item/autochisel, 10, 400), new /datum/data/mining_equipment(/obj/item/tank/jetpack, 10, 400), - new /datum/data/mining_equipment(/obj/item/device/mine_bot_upgrade, 10, 400), + new /datum/data/mining_equipment(/obj/item/mine_bot_upgrade, 10, 400), new /datum/data/mining_equipment(/obj/machinery/mining/brace, -1, 500, 1), new /datum/data/mining_equipment(/obj/item/card/mining_point_card, -1, 500), new /datum/data/mining_equipment(/obj/item/storage/belt/mining, 10, 500), new /datum/data/mining_equipment(/obj/item/warp_core, 25, 500), new /datum/data/mining_equipment(/obj/item/extraction_pack, 25, 600), - new /datum/data/mining_equipment(/obj/item/device/mine_bot_upgrade/health, 20, 600), + new /datum/data/mining_equipment(/obj/item/mine_bot_upgrade/health, 20, 600), new /datum/data/mining_equipment(/obj/item/storage/firstaid/trauma, 30, 600), new /datum/data/mining_equipment(/obj/item/oremagnet, 10, 600), new /datum/data/mining_equipment(/obj/item/resonator, 10, 700), - new /datum/data/mining_equipment(/obj/item/device/wormhole_jaunter, 20, 750), + new /datum/data/mining_equipment(/obj/item/wormhole_jaunter, 20, 750), new /datum/data/mining_equipment(/obj/item/rig/industrial, 5, 1000), new /datum/data/mining_equipment(/obj/item/mass_driver_diy, 5, 800), new /datum/data/mining_equipment(/mob/living/silicon/robot/drone/mining, 15, 800), - new /datum/data/mining_equipment(/obj/item/device/mine_bot_upgrade/ka, 10, 800), + new /datum/data/mining_equipment(/obj/item/mine_bot_upgrade/ka, 10, 800), new /datum/data/mining_equipment(/obj/item/oreportal, 35, 800), - new /datum/data/mining_equipment(/obj/item/device/spaceflare, 5, 800), + new /datum/data/mining_equipment(/obj/item/spaceflare, 5, 800), new /datum/data/mining_equipment(/obj/item/lazarus_injector, 25, 1000), new /datum/data/mining_equipment(/obj/item/storage/backpack/cell, 5, 1000), new /datum/data/mining_equipment(/obj/machinery/mining/drill, -1, 1000, 1), new /datum/data/mining_equipment(/obj/item/resonator/upgraded, 10, 1250), new /datum/data/mining_equipment(/obj/item/pickaxe/diamond, 10, 1500), new /datum/data/mining_equipment(/obj/item/gun/energy/vaurca/thermaldrill, 5, 1750), - new /datum/data/mining_equipment(/obj/item/device/orbital_dropper/minecart, 5, 2000), - new /datum/data/mining_equipment(/obj/item/device/orbital_dropper/drill, 10, 3250), - new /datum/data/mining_equipment(/obj/item/device/orbital_dropper/mecha/miner, 2, 3500) + new /datum/data/mining_equipment(/obj/item/orbital_dropper/minecart, 5, 2000), + new /datum/data/mining_equipment(/obj/item/orbital_dropper/drill, 10, 3250), + new /datum/data/mining_equipment(/obj/item/orbital_dropper/mecha/miner, 2, 3500) )) /obj/machinery/mineral/equipment_vendor diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 35c3ac90721..219309ce1ad 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -675,7 +675,7 @@ /**********************Jaunter**********************/ -/obj/item/device/wormhole_jaunter +/obj/item/wormhole_jaunter name = "wormhole jaunter" desc = "A single use device harnessing outdated warp technology. The wormholes it creates are unpleasant to travel through, to say the least." contained_sprite = TRUE @@ -689,29 +689,29 @@ slot_flags = SLOT_BELT origin_tech = list(TECH_BLUESPACE = 2, TECH_PHORON = 4, TECH_ENGINEERING = 4) -/obj/item/device/wormhole_jaunter/attack_self(mob/user) +/obj/item/wormhole_jaunter/attack_self(mob/user) user.visible_message(SPAN_NOTICE("\The [user] activates \the [src]!")) feedback_add_details("jaunter", "U") // user activated activate(user) -/obj/item/device/wormhole_jaunter/proc/turf_check(mob/user) +/obj/item/wormhole_jaunter/proc/turf_check(mob/user) var/turf/device_turf = get_turf(user) if(!device_turf || device_turf.z == 0) to_chat(user, SPAN_NOTICE("You're having difficulties getting \the [src] to work.")) return FALSE return TRUE -/obj/item/device/wormhole_jaunter/proc/get_destinations(mob/user) +/obj/item/wormhole_jaunter/proc/get_destinations(mob/user) var/list/destinations = list() - for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons) + for(var/obj/item/radio/beacon/B in GLOB.teleportbeacons) var/turf/T = get_turf(B) if(is_station_level(T.z)) destinations += B return destinations -/obj/item/device/wormhole_jaunter/proc/activate(mob/user) +/obj/item/wormhole_jaunter/proc/activate(mob/user) if(!turf_check(user)) return @@ -725,7 +725,7 @@ playsound(src,'sound/effects/sparks4.ogg', 50, 1) qdel(src) -/obj/item/device/wormhole_jaunter/emp_act(severity) +/obj/item/wormhole_jaunter/emp_act(severity) . = ..() var/triggered = FALSE diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 1997a6e7679..2f97da67aa5 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -263,18 +263,18 @@ GLOBAL_LIST_INIT(mineral_can_smooth_with, list( to_chat(user, SPAN_WARNING("You don't have the dexterity to do this!")) return - if(istype(attacking_item, /obj/item/device/core_sampler)) - var/obj/item/device/core_sampler/C = attacking_item + if(istype(attacking_item, /obj/item/core_sampler)) + var/obj/item/core_sampler/C = attacking_item C.sample_item(src, user) return - if(istype(attacking_item, /obj/item/device/depth_scanner)) - var/obj/item/device/depth_scanner/C = attacking_item + if(istype(attacking_item, /obj/item/depth_scanner)) + var/obj/item/depth_scanner/C = attacking_item C.scan_atom(user, src) return - if(istype(attacking_item, /obj/item/device/measuring_tape)) - var/obj/item/device/measuring_tape/P = attacking_item + if(istype(attacking_item, /obj/item/measuring_tape)) + var/obj/item/measuring_tape/P = attacking_item user.visible_message(SPAN_NOTICE("\The [user] extends \the [P] towards \the [src].") , SPAN_NOTICE("You extend \the [P] towards \the [src].")) if(do_after(user,25)) if(!istype(src, /turf/simulated/mineral)) diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 12ac83582fe..299673ddf61 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -88,8 +88,8 @@ to_chat(user, SPAN_WARNING("\The [src] is not compatible with \the [attacking_item].")) return - if(istype(attacking_item, /obj/item/device/mine_bot_upgrade)) - var/obj/item/device/mine_bot_upgrade/MBU = attacking_item + if(istype(attacking_item, /obj/item/mine_bot_upgrade)) + var/obj/item/mine_bot_upgrade/MBU = attacking_item MBU.upgrade_bot(src, user) return @@ -138,13 +138,13 @@ /**********************Minebot Upgrades**********************/ -/obj/item/device/mine_bot_upgrade +/obj/item/mine_bot_upgrade name = "minebot drill upgrade" desc = "A minebot upgrade." icon_state = "mainboard" icon = 'icons/obj/module.dmi' -/obj/item/device/mine_bot_upgrade/proc/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) +/obj/item/mine_bot_upgrade/proc/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) if(M.drill_upgrade) to_chat(user, SPAN_WARNING("[src] already has a drill upgrade installed!")) return @@ -161,10 +161,10 @@ to_chat(user, SPAN_NOTICE("You successfully install \the [src] into \the [M].")) qdel(src) -/obj/item/device/mine_bot_upgrade/health +/obj/item/mine_bot_upgrade/health name = "minebot chassis upgrade" -/obj/item/device/mine_bot_upgrade/health/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) +/obj/item/mine_bot_upgrade/health/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) if(M.health_upgrade) to_chat(user, SPAN_WARNING("[src] already has a reinforced chassis!")) return @@ -178,10 +178,10 @@ to_chat(user, SPAN_NOTICE("You successfully install \the [src] into \the [M].")) qdel(src) -/obj/item/device/mine_bot_upgrade/ka +/obj/item/mine_bot_upgrade/ka name = "minebot kinetic accelerator upgrade" -/obj/item/device/mine_bot_upgrade/ka/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) +/obj/item/mine_bot_upgrade/ka/upgrade_bot(var/mob/living/silicon/robot/drone/mining/M, mob/user) if(M.ranged_upgrade) to_chat(user, "[src] already has a KA upgrade installed!") return diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index ac32c421227..a90d3671036 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -96,8 +96,8 @@ material = null /obj/item/ore/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item,/obj/item/device/core_sampler)) - var/obj/item/device/core_sampler/C = attacking_item + if(istype(attacking_item,/obj/item/core_sampler)) + var/obj/item/core_sampler/C = attacking_item C.sample_item(src, user) else return ..() diff --git a/code/modules/mob/abstract/ghost/ghost.dm b/code/modules/mob/abstract/ghost/ghost.dm index 39c9b2ec8f2..86da2ead88e 100644 --- a/code/modules/mob/abstract/ghost/ghost.dm +++ b/code/modules/mob/abstract/ghost/ghost.dm @@ -8,7 +8,7 @@ /// If the ghost has antagHUD. var/antagHUD = 0 /// Necessary for seeing wires. - var/obj/item/device/multitool/ghost_multitool + var/obj/item/multitool/ghost_multitool /// The POI we're orbiting. var/orbiting_ref diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index fbc02c500f5..00300830f23 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -321,8 +321,8 @@ return 1 if (M.l_ear || M.r_ear) - var/obj/item/device/radio/headset/dongle - if(istype(M.l_ear,/obj/item/device/radio/headset)) + var/obj/item/radio/headset/dongle + if(istype(M.l_ear,/obj/item/radio/headset)) dongle = M.l_ear else dongle = M.r_ear diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 19a50db64ac..f57d5dcf3ad 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -23,7 +23,7 @@ var/last_emote = 0 // timer for emotes var/can_take_pai = TRUE - var/obj/item/device/paicard/pAI + var/obj/item/paicard/pAI var/old_name /mob/living/bot/Initialize() @@ -136,14 +136,14 @@ user.put_in_hands(pAI) user.visible_message(SPAN_NOTICE("\The [user] pries \the [pAI.pai] out of \the [src]."), SPAN_NOTICE("You pry \the [pAI.pai] out of \the [src].")) pAI = null - else if(istype(attacking_item, /obj/item/device/paicard)) + else if(istype(attacking_item, /obj/item/paicard)) if(!can_take_pai) to_chat(user, SPAN_WARNING("\The [src] cannot take a pAI!")) return if(pAI) to_chat(user, SPAN_WARNING("\The [src] already has a pAI installed!")) return - var/obj/item/device/paicard/P = attacking_item + var/obj/item/paicard/P = attacking_item P.pai.open_up(FALSE) P.pai.close_up() user.drop_from_inventory(P, src) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 5bbf8b0a054..f8bf4d124d6 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -307,7 +307,7 @@ GLOBAL_LIST_INIT_TYPED(cleanbot_types, /obj/effect/decal/cleanable, typesof(/obj visible_message(SPAN_WARNING("[src] blows apart!")) var/turf/T = get_turf(src) new /obj/item/reagent_containers/glass/bucket(T) - new /obj/item/device/assembly/prox_sensor(T) + new /obj/item/assembly/prox_sensor(T) if(prob(50)) new /obj/item/robot_parts/l_arm(T) spark(src, 3, GLOB.alldirs) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 41e62dae3a2..baa63276a02 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -327,8 +327,8 @@ new /obj/item/material/minihoe(T) new /obj/item/reagent_containers/glass/bucket(T) - new /obj/item/device/assembly/prox_sensor(T) - new /obj/item/device/analyzer/plant_analyzer(T) + new /obj/item/assembly/prox_sensor(T) + new /obj/item/analyzer/plant_analyzer(T) if(tank) tank.forceMove(T) if(prob(50)) @@ -384,7 +384,7 @@ /obj/item/farmbot_arm_assembly/attackby(obj/item/attacking_item, mob/user) ..() - if(istype(attacking_item, /obj/item/device/analyzer/plant_analyzer) && build_step == 0) + if(istype(attacking_item, /obj/item/analyzer/plant_analyzer) && build_step == 0) build_step++ to_chat(user, SPAN_NOTICE("You add the plant analyzer to [src].")) name = "farmbot assembly" diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index c1d187b74e3..4a3c202fb42 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -127,7 +127,7 @@ if(!underlays.len) underlays += image(firstaid_item.icon, firstaid_item.icon_state) var/matrix/M = matrix() - var/image/ha_image = image('icons/obj/item/device/healthanalyzer.dmi', "health") + var/image/ha_image = image('icons/obj/item/healthanalyzer.dmi', "health") M.Translate(5, 0) ha_image.transform = M underlays += ha_image @@ -273,8 +273,8 @@ firstaid_item.forceMove(Tsec) firstaid_item.contents = null firstaid_item = null - new /obj/item/device/assembly/prox_sensor(Tsec) - new /obj/item/device/healthanalyzer(Tsec) + new /obj/item/assembly/prox_sensor(Tsec) + new /obj/item/healthanalyzer(Tsec) if (prob(50)) new /obj/item/robot_parts/l_arm(Tsec) @@ -369,14 +369,14 @@ else switch(build_step) if(0) - if(istype(attacking_item, /obj/item/device/healthanalyzer)) + if(istype(attacking_item, /obj/item/healthanalyzer)) user.drop_from_inventory(attacking_item,get_turf(src)) qdel(attacking_item) build_step++ to_chat(user, SPAN_NOTICE("You add the health sensor to [src].")) name = "first-aid/robot arm/health analyzer assembly" var/matrix/M = matrix() - var/image/ha_image = image('icons/obj/item/device/healthanalyzer.dmi', "health") + var/image/ha_image = image('icons/obj/item/healthanalyzer.dmi', "health") M.Translate(5, 0) ha_image.transform = M underlays += ha_image diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 28188373b31..0cfb28f2fe0 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -4,7 +4,7 @@ #define STATE_DIODES 3 // brain gets prepared at this step #define STATE_SEALED 4 // sealed and fully operation -/obj/item/device/mmi +/obj/item/mmi name = "man-machine interface" desc = "The delicate nature of organic brains required a more novel and permanent solution to the problem of just rotting in the old MMI cradles. Zeng-Hu's unique (and very proprietary) formaldehyde-analogue preservation solution was the key ingredient in what became the new Zeng-Hu/Hephaestus joint venture brain-cases." icon = 'icons/obj/assemblies.dmi' @@ -32,11 +32,11 @@ var/static/list/valid_braintype = list("Skrell", "Vaurca") -/obj/item/device/mmi/Initialize() +/obj/item/mmi/Initialize() . = ..() set_cradle_state(STATE_EMPTY) -/obj/item/device/mmi/update_icon() +/obj/item/mmi/update_icon() underlays = null switch(cradle_state) // there's probably a way to optimize this to not need to regenerate the image, but this'll happen once a round every month or so? no reason to. if(STATE_EMPTY) @@ -53,13 +53,13 @@ if(STATE_SEALED) icon_state = "mmi-sealedon" -/obj/item/device/mmi/proc/update_name() +/obj/item/mmi/proc/update_name() if(brainmob) name = "[initial(name)]: [brainmob.real_name]" else name = initial(name) -/obj/item/device/mmi/proc/set_cradle_state(var/new_state) +/obj/item/mmi/proc/set_cradle_state(var/new_state) cradle_state = new_state switch(cradle_state) if(STATE_EMPTY) @@ -74,12 +74,12 @@ extra_examine_info = "The braincase is sealed and ready for use. The only thing that will undo the seal is a circular saw, and that will destroy the brain inside." update_icon() -/obj/item/device/mmi/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) +/obj/item/mmi/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() if(extra_examine_info) . += SPAN_NOTICE(extra_examine_info) -/obj/item/device/mmi/attackby(obj/item/attacking_item, mob/user) +/obj/item/mmi/attackby(obj/item/attacking_item, mob/user) switch(cradle_state) if(STATE_EMPTY) if(!brainmob && istype(attacking_item, /obj/item/organ/internal/brain)) //Time to stick a brain in it --NEO @@ -145,7 +145,7 @@ set_cradle_state(STATE_EMPTY) update_name() -/obj/item/device/mmi/attack_self(mob/user) +/obj/item/mmi/attack_self(mob/user) if(cradle_state == STATE_BRAIN) to_chat(user, SPAN_NOTICE("You flip the case over \the [brainobj], getting it in place for diode insertion.")) set_cradle_state(STATE_NODIODES) @@ -153,7 +153,7 @@ to_chat(user, SPAN_NOTICE("You flip the case up, exposing \the [brainobj].")) set_cradle_state(STATE_BRAIN) -/obj/item/device/mmi/attack_hand(mob/user) +/obj/item/mmi/attack_hand(mob/user) if(brainobj && cradle_state == STATE_BRAIN && user.get_inactive_hand() == src) to_chat(user, SPAN_NOTICE("You remove \the [brainobj] from \the [src].")) user.put_in_hands(brainobj) @@ -163,7 +163,7 @@ return return ..() -/obj/item/device/mmi/proc/transfer_mob_to_brain() +/obj/item/mmi/proc/transfer_mob_to_brain() brainmob.container = null //Reset brainmob mmi var. brainmob.forceMove(brainobj) //Throw mob into brain. GLOB.living_mob_list -= brainmob //Get outta here @@ -172,7 +172,7 @@ brainmob = null braintype = null -/obj/item/device/mmi/proc/ready_for_use(var/mob/user) +/obj/item/mmi/proc/ready_for_use(var/mob/user) if(cradle_state != STATE_SEALED) to_chat(user, SPAN_WARNING("\The [src] hasn't been completed and sealed yet!")) return FALSE @@ -181,7 +181,7 @@ return FALSE return TRUE -/obj/item/device/mmi/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people. +/obj/item/mmi/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people. brainmob = new(src) brainmob.name = H.real_name brainmob.real_name = H.real_name @@ -191,7 +191,7 @@ set_cradle_state(STATE_SEALED) update_name() -/obj/item/device/mmi/proc/braintype_check() +/obj/item/mmi/proc/braintype_check() if(!brainobj) return var/species_check = brainobj.species.category_name @@ -201,7 +201,7 @@ if("Vaurca") braintype = "vaurca" -/obj/item/device/mmi/relaymove(mob/living/user, direction) +/obj/item/mmi/relaymove(mob/living/user, direction) . = ..() if(user.stat || user.stunned) @@ -210,7 +210,7 @@ if(istype(rig)) rig.forced_move(direction, user) -/obj/item/device/mmi/emag_act(remaining_charges, mob/user, emag_source) +/obj/item/mmi/emag_act(remaining_charges, mob/user, emag_source) if(cradle_state == STATE_SEALED) if(memory_suppression) to_chat(user, SPAN_NOTICE("You disable \the [src]'s memory suppression systems.")) @@ -228,7 +228,7 @@ memory_suppression = TRUE return 1 -/obj/item/device/mmi/Destroy() +/obj/item/mmi/Destroy() if(isrobot(loc)) var/mob/living/silicon/robot/borg = loc borg.mmi = null @@ -243,20 +243,20 @@ return ..() -/obj/item/device/mmi/radio_enabled +/obj/item/mmi/radio_enabled name = "radio-enabled man-machine interface" desc = "The delicate nature of organic brains required a more novel and permanent solution to the problem of just rotting in the old MMI cradles. Zeng-Hu's unique (and very proprietary) formaldehyde-analogue preservation solution was the key ingredient in what became the new Zeng-Hu/Hephaestus joint venture brain-cases. This one comes with a built-in radio." origin_tech = list(TECH_BIO = 4) - var/obj/item/device/radio/radio = null//Let's give it a radio. + var/obj/item/radio/radio = null//Let's give it a radio. -/obj/item/device/mmi/radio_enabled/Initialize() +/obj/item/mmi/radio_enabled/Initialize() . = ..() radio = new(src)//Spawns a radio inside the MMI. radio.set_broadcasting(TRUE) //So it's broadcasting from the start. //Allows the brain to toggle the radio functions. -/obj/item/device/mmi/radio_enabled/verb/Toggle_Broadcasting() +/obj/item/mmi/radio_enabled/verb/Toggle_Broadcasting() set name = "Toggle Broadcasting" set desc = "Toggle broadcasting channel on or off." set category = "MMI" @@ -269,7 +269,7 @@ radio.set_broadcasting(!radio.get_broadcasting()) to_chat(brainmob, SPAN_NOTICE("Radio is [radio.get_broadcasting() ? "now" : "no longer"] broadcasting.")) -/obj/item/device/mmi/radio_enabled/verb/Toggle_Listening() +/obj/item/mmi/radio_enabled/verb/Toggle_Listening() set name = "Toggle Listening" set desc = "Toggle listening channel on or off." set category = "MMI" @@ -282,7 +282,7 @@ radio.set_listening(!radio.get_listening()) to_chat(brainmob, SPAN_NOTICE("Radio is [radio.get_listening() ? "now" : "no longer"] receiving broadcast.")) -/obj/item/device/mmi/emp_act(severity) +/obj/item/mmi/emp_act(severity) . = ..() if(!brainmob) @@ -294,7 +294,7 @@ if(EMP_LIGHT) brainmob.emp_damage += rand(10,20) -/obj/item/device/mmi/digital/Initialize(mapload, ...) +/obj/item/mmi/digital/Initialize(mapload, ...) . = ..() brainmob = new(src) brainmob.add_language(LANGUAGE_EAL) @@ -302,23 +302,23 @@ brainmob.container = src brainmob.silent = 0 -/obj/item/device/mmi/digital/transfer_identity(var/mob/living/carbon/H) +/obj/item/mmi/digital/transfer_identity(var/mob/living/carbon/H) brainmob.dna = H.dna brainmob.timeofhostdeath = H.timeofdeath brainmob.set_stat(CONSCIOUS) if(H.mind) H.mind.transfer_to(brainmob) -/obj/item/device/mmi/shell +/obj/item/mmi/shell name = "ai shell control module" desc = "A specialised circuit created to permit an artificial intelligence to take over the body of a stationbound unit." icon = 'icons/obj/module.dmi' origin_tech = list(TECH_DATA = 6, TECH_ENGINEERING = 6) -/obj/item/device/mmi/shell/attackby() +/obj/item/mmi/shell/attackby() return -/obj/item/device/mmi/shell/Initialize() +/obj/item/mmi/shell/Initialize() . = ..() set_cradle_state(STATE_SEALED) icon_state = "shell_circuit" diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 1baed537051..57833065b1f 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -27,7 +27,7 @@ return TRUE /mob/living/carbon/brain/update_canmove() - if(istype(loc, /obj/item/device/mmi)) + if(istype(loc, /obj/item/mmi)) canmove = 1 use_me = 1 else diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index f431ee560c2..689d4861706 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -1,5 +1,5 @@ /mob/living/carbon/brain/death(gibbed) - if(!gibbed && istype(container, /obj/item/device/mmi)) //If not gibbed but in a container. + if(!gibbed && istype(container, /obj/item/mmi)) //If not gibbed but in a container. container.icon_state = "mmi_dead" return ..(gibbed,"beeps shrilly as the MMI flatlines!") else diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 1c9bc475dde..110cadd9111 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -1,5 +1,5 @@ /mob/living/carbon/brain/emote(var/act,var/m_type=1,var/message = null) - if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes + if(!(container && istype(container, /obj/item/mmi)))//No MMI, no emotes return if (findtext(act, "-", 1, null)) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index ca0217488a7..6d4997e13ef 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -110,7 +110,7 @@ //Handling EMP effect in the Life(), it's made VERY simply, and has some additional effects handled elsewhere if(emp_damage) //This is pretty much a damage type only used by MMIs, dished out by the emp_act - if(!(container && istype(container, /obj/item/device/mmi))) + if(!(container && istype(container, /obj/item/mmi))) emp_damage = 0 else emp_damage = round(emp_damage,1)//Let's have some nice numbers to work with diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index f43345f0af6..f4a47bef7a3 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -1,4 +1,4 @@ -/obj/item/device/mmi/digital/posibrain +/obj/item/mmi/digital/posibrain name = "positronic brain" desc = "A cube of shining metal, four inches to a side and covered in shallow grooves." icon = 'icons/obj/assemblies.dmi' @@ -9,13 +9,13 @@ can_be_ipc = TRUE var/searching = FALSE -/obj/item/device/mmi/digital/posibrain/Initialize() +/obj/item/mmi/digital/posibrain/Initialize() . = ..() var/datum/language/L = GLOB.all_languages[LANGUAGE_EAL] brainmob.name = L.get_random_name() brainmob.real_name = brainmob.name -/obj/item/device/mmi/digital/posibrain/update_icon() +/obj/item/mmi/digital/posibrain/update_icon() if(brainmob.ckey) icon_state = "[initial(icon_state)]-occupied" else if(searching) @@ -23,10 +23,10 @@ else icon_state = initial(icon_state) -/obj/item/device/mmi/digital/posibrain/attackby(obj/item/attacking_item, mob/user) +/obj/item/mmi/digital/posibrain/attackby(obj/item/attacking_item, mob/user) return -/obj/item/device/mmi/digital/posibrain/attack_self(mob/user) +/obj/item/mmi/digital/posibrain/attack_self(mob/user) if(brainmob.ckey) to_chat(user, SPAN_WARNING("\The [src] already has an active occupant!")) return @@ -41,7 +41,7 @@ SSghostroles.remove_spawn_atom("posibrain", src) update_icon() -/obj/item/device/mmi/digital/posibrain/assign_player(var/mob/user) +/obj/item/mmi/digital/posibrain/assign_player(var/mob/user) if(brainmob.ckey) return @@ -59,7 +59,7 @@ return src -/obj/item/device/mmi/digital/posibrain/update_name() +/obj/item/mmi/digital/posibrain/update_name() var/new_name = tgui_input_text(brainmob, "Choose your name.", "Name Selection", brainmob.real_name, MAX_NAME_LEN) if(new_name) brainmob.real_name = new_name @@ -68,7 +68,7 @@ visible_message(SPAN_NOTICE("\The [src] chimes quietly.")) return ..() -/obj/item/device/mmi/digital/posibrain/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) +/obj/item/mmi/digital/posibrain/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() . += "This is [icon2html(src, user)] \a [src]!\n[desc]\n" @@ -85,7 +85,7 @@ else . += "It appears to be completely inactive.\n" -/obj/item/device/mmi/digital/posibrain/ready_for_use(var/mob/user) +/obj/item/mmi/digital/posibrain/ready_for_use(var/mob/user) if(!brainmob) to_chat(user, SPAN_WARNING("\The [src] doesn't have a personality loaded on it yet!")) return @@ -94,10 +94,10 @@ return FALSE return TRUE -/obj/item/device/mmi/digital/posibrain/set_cradle_state(var/new_state) +/obj/item/mmi/digital/posibrain/set_cradle_state(var/new_state) return -/obj/item/device/mmi/digital/posibrain/emp_act(severity) +/obj/item/mmi/digital/posibrain/emp_act(severity) . = ..() if(!brainmob) diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index 9887281ff7d..482dae69511 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -1,4 +1,4 @@ -/obj/item/device/mmi/digital/robot +/obj/item/mmi/digital/robot name = "robotic intelligence circuit" desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science." icon = 'icons/obj/module.dmi' @@ -6,22 +6,22 @@ w_class = WEIGHT_CLASS_NORMAL origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4) -/obj/item/device/mmi/digital/robot/Initialize(mapload, ...) +/obj/item/mmi/digital/robot/Initialize(mapload, ...) . = ..() brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN"))]-[rand(1000, 9999)]" brainmob.real_name = brainmob.name name = "robotic intelligence circuit ([brainmob.name])" -/obj/item/device/mmi/digital/robot/update_icon() +/obj/item/mmi/digital/robot/update_icon() icon_state = "mainboard" -/obj/item/device/mmi/digital/robot/transfer_identity(mob/living/carbon/H) +/obj/item/mmi/digital/robot/transfer_identity(mob/living/carbon/H) ..() if(brainmob.mind) brainmob.mind.assigned_role = "Robotic Intelligence" to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") -/obj/item/device/mmi/digital/robot/ready_for_use(var/mob/user) +/obj/item/mmi/digital/robot/ready_for_use(var/mob/user) if(!brainmob) to_chat(user, SPAN_WARNING("\The [src] doesn't have a personality loaded on it yet!")) return @@ -30,11 +30,11 @@ return FALSE return TRUE -/obj/item/device/mmi/digital/robot/set_cradle_state(var/new_state) +/obj/item/mmi/digital/robot/set_cradle_state(var/new_state) return -/obj/item/device/mmi/digital/robot/attackby(obj/item/attacking_item, mob/user) +/obj/item/mmi/digital/robot/attackby(obj/item/attacking_item, mob/user) return -/obj/item/device/mmi/digital/robot/attack_self(mob/user) +/obj/item/mmi/digital/robot/attack_self(mob/user) return diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index 5dca3884359..4de289de48a 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -3,7 +3,7 @@ if (silent) return - if(!(container && istype(container, /obj/item/device/mmi))) + if(!(container && istype(container, /obj/item/mmi))) return //No MMI, can't speak, bucko./N else speaking = parse_language(message) @@ -29,8 +29,8 @@ speaking.broadcast(src,trim(message)) return - if(istype(container, /obj/item/device/mmi/radio_enabled)) - var/obj/item/device/mmi/radio_enabled/R = container + if(istype(container, /obj/item/mmi/radio_enabled)) + var/obj/item/mmi/radio_enabled/R = container if(R.radio) R.radio.hear_talk(src, sanitize(message), verb, speaking) ..(trim(message), speaking, verb) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 980e6152c45..0c429921ca3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -218,7 +218,7 @@ /// This needs to be updated to use signals. var/holding_gps = FALSE - if(istype(src.get_active_hand(), /obj/item/device/gps) || istype(src.get_inactive_hand(), /obj/item/device/gps)) + if(istype(src.get_active_hand(), /obj/item/gps) || istype(src.get_inactive_hand(), /obj/item/gps)) holding_gps = TRUE var/area/A = get_area(src) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 77f8e2ef201..3eec815aa7d 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -228,7 +228,7 @@ return src /mob/living/carbon/human/proc/has_hearing_aid() - if(istype(l_ear, /obj/item/device/hearing_aid) || istype(r_ear, /obj/item/device/hearing_aid)) + if(istype(l_ear, /obj/item/hearing_aid) || istype(r_ear, /obj/item/hearing_aid)) return TRUE if(has_functioning_augment(BP_AUG_COCHLEAR)) return TRUE diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 5c5c5a83083..f5b70f11bc1 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -185,7 +185,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit) equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(src), slot_l_ear) + equip_to_slot_or_del(new /obj/item/radio/headset/headset_com(src), slot_l_ear) remote_network = REMOTE_BUNKER_ROBOT SSvirtualreality.add_robot(src, remote_network) @@ -200,7 +200,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) mind.name = real_name status_flags |= NO_ANTAG - equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_penal(src), slot_l_ear) + equip_to_slot_or_del(new /obj/item/radio/headset/headset_penal(src), slot_l_ear) remote_network = REMOTE_PRISON_ROBOT SSvirtualreality.add_robot(src, remote_network) @@ -222,7 +222,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) equip_to_slot_or_del(ID, slot_wear_id) equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden/remote(src), slot_w_uniform) equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_warden(src), slot_l_ear) + equip_to_slot_or_del(new /obj/item/radio/headset/headset_warden(src), slot_l_ear) remote_network = REMOTE_WARDEN_ROBOT SSvirtualreality.add_robot(src, remote_network) @@ -261,7 +261,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit) equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(src), slot_l_ear) + equip_to_slot_or_del(new /obj/item/radio/headset/headset_com(src), slot_l_ear) remote_network = REMOTE_BUNKER_ROBOT SSvirtualreality.add_robot(src, remote_network) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 7fb24512d38..e1b498498a6 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -179,11 +179,11 @@ /mob/living/carbon/human/get_radio() var/list/headsets = list() - if(istype(l_ear, /obj/item/device/radio)) + if(istype(l_ear, /obj/item/radio)) headsets["Left Ear"] = l_ear - if(istype(r_ear, /obj/item/device/radio)) + if(istype(r_ear, /obj/item/radio)) headsets["Right Ear"] = r_ear - if(istype(wrists, /obj/item/device/radio)) + if(istype(wrists, /obj/item/radio)) headsets["Wrist"] = wrists if(length(headsets)) @@ -198,46 +198,46 @@ return TRUE switch(message_mode) if("intercom") - for(var/obj/item/device/radio/intercom/I in view(1)) + for(var/obj/item/radio/intercom/I in view(1)) I.add_fingerprint(src) used_radios += I I.talk_into(src, message, null, verb, speaking) if("headset") - var/obj/item/device/radio/R = get_radio() + var/obj/item/radio/R = get_radio() if(R) used_radios += R R.talk_into(src, message, null, verb, speaking) if("right ear") - var/obj/item/device/radio/R + var/obj/item/radio/R var/has_radio = FALSE - if(istype(r_ear,/obj/item/device/radio)) + if(istype(r_ear,/obj/item/radio)) R = r_ear has_radio = TRUE - if(istype(r_hand, /obj/item/device/radio)) + if(istype(r_hand, /obj/item/radio)) R = r_hand has_radio = TRUE if(has_radio) used_radios += R R.talk_into(src,message,null,verb,speaking) if("left ear") - var/obj/item/device/radio/R + var/obj/item/radio/R var/has_radio = FALSE - if(istype(l_ear, /obj/item/device/radio)) + if(istype(l_ear, /obj/item/radio)) R = l_ear has_radio = TRUE - if(istype(l_hand, /obj/item/device/radio)) + if(istype(l_hand, /obj/item/radio)) R = l_hand has_radio = TRUE if(has_radio) used_radios += R R.talk_into(src,message,null,verb,speaking) if("wrist") - var/obj/item/device/radio/R + var/obj/item/radio/R var/has_radio = FALSE - if(istype(wrists,/obj/item/device/radio)) + if(istype(wrists,/obj/item/radio)) R = wrists has_radio = TRUE - if(istype(r_hand, /obj/item/device/radio)) + if(istype(r_hand, /obj/item/radio)) R = wrists has_radio = TRUE if(has_radio) @@ -248,7 +248,7 @@ return TRUE else if(message_mode) - var/obj/item/device/radio/R = get_radio() + var/obj/item/radio/R = get_radio() if(R) used_radios += R R.talk_into(src, message, message_mode, verb, speaking) @@ -259,7 +259,7 @@ return returns /mob/living/carbon/human/binarycheck() - for(var/obj/item/device/radio/headset/dongle in list(l_ear, r_ear)) + for(var/obj/item/radio/headset/dongle in list(l_ear, r_ear)) if(dongle.translate_binary) return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 8e07820060a..eeef52df7d5 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -217,7 +217,7 @@ They are very slow, reasonably strong, and quite durable. They also require ligh if(SB) break if(SB) - SB.handle_item_insertion(new /obj/item/device/flashlight/survival(get_turf(H)), TRUE) + SB.handle_item_insertion(new /obj/item/flashlight/survival(get_turf(H)), TRUE) /datum/species/diona/is_naturally_insulated() return TRUE diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 077519b12a4..4f0eb036d2d 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -805,7 +805,7 @@ There are several things that need to be remembered: var/layer = L_EAR_LAYER var/layer_alt = L_EAR_LAYER_ALT - var/obj/item/device/radio/headset/wrist/W = l_ear + var/obj/item/radio/headset/wrist/W = l_ear if(istype(W) && W.mob_wear_layer == ABOVE_SUIT_LAYER_WR) layer = L_EAR_LAYER_ALT layer_alt = L_EAR_LAYER @@ -846,7 +846,7 @@ There are several things that need to be remembered: var/layer = R_EAR_LAYER var/layer_alt = R_EAR_LAYER_ALT - var/obj/item/device/radio/headset/wrist/W = r_ear + var/obj/item/radio/headset/wrist/W = r_ear if(istype(W) && W.mob_wear_layer == ABOVE_SUIT_LAYER_WR) layer = R_EAR_LAYER_ALT layer_alt = R_EAR_LAYER @@ -1322,7 +1322,7 @@ There are several things that need to be remembered: var/image/wrists_overlay = wrists.get_mob_overlay(src, mob_icon, mob_state, slot_wrists_str) var/wrist_layer = ABOVE_SUIT_LAYER_WR - if(istype(wrists, /obj/item/clothing/wrists) || istype(wrists, /obj/item/device/radio/headset/wrist)) + if(istype(wrists, /obj/item/clothing/wrists) || istype(wrists, /obj/item/radio/headset/wrist)) var/obj/item/clothing/wrists/W = wrists wrist_layer = W.mob_wear_layer diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 5cfde5bc806..fe5ed952b8a 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -98,7 +98,7 @@ Stun(2) //Being hit while using a deadman switch - var/obj/item/device/assembly/signaler/signaler = get_active_hand() + var/obj/item/assembly/signaler/signaler = get_active_hand() if(istype(signaler)) if(signaler.deadman && prob(80)) log_and_message_admins("has triggered a signaler deadman's switch") diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 92720d1f7f1..776e1421641 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -147,7 +147,7 @@ var/list/channel_to_radio_key = new /mob/living/proc/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, whisper) if(message_mode == "intercom") - for(var/obj/item/device/radio/intercom/I in view(1, src)) + for(var/obj/item/radio/intercom/I in view(1, src)) used_radios += I I.talk_into(src, message, verb, speaking) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 0e48c43fada..965e92d8469 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -68,8 +68,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( var/obj/machinery/camera/camera /// For storing what is shown to the cameras var/list/cameraRecords = list() - var/obj/item/device/multitool/ai_multi - var/obj/item/device/radio/headset/heads/ai_integrated/ai_radio + var/obj/item/multitool/ai_multi + var/obj/item/radio/headset/heads/ai_integrated/ai_radio var/datum/announcement/priority/announcement var/obj/machinery/ai_powersupply/psupply @@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( remove_verb(src, GLOB.ai_verbs_default) remove_verb(src, silicon_subsystems) -/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, obj/item/device/mmi/B, safety = 0) +/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, obj/item/mmi/B, safety = 0) shouldnt_see = typecacheof(/obj/effect/rune) announcement = new() announcement.title = "A.I. Announcement" @@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( ai_radio.myAi = src additional_law_channels["Holopad"] = ":h" - ai_camera = new/obj/item/device/camera/siliconcam/ai_camera(src) + ai_camera = new/obj/item/camera/siliconcam/ai_camera(src) if(istype(loc, /turf)) add_ai_verbs(src) diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index dfd9eac4b1b..2e6a95f35e8 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -27,12 +27,12 @@ . = ..() modules += new /obj/item/crowbar/hydraulic_rescue_tool(src) modules += new /obj/item/wrench/robotic(src) - modules += new /obj/item/device/healthanalyzer(src) + modules += new /obj/item/healthanalyzer(src) modules += new /obj/item/extinguisher/mini(src) - modules += new /obj/item/device/advanced_healthanalyzer/cyborg(src) + modules += new /obj/item/advanced_healthanalyzer/cyborg(src) modules += new /obj/item/tank/jetpack/carbondioxide/synthetic(src) modules += new /obj/item/inflatable_dispenser(src) - modules += new /obj/item/device/gps(src) + modules += new /obj/item/gps(src) modules += new /obj/item/taperoll/medical(src) modules += new /obj/item/taperoll/engineering(src) modules += new /obj/item/taperoll/police(src) @@ -40,7 +40,7 @@ modules += new /obj/item/pen/robopen(src) modules += new /obj/item/form_printer(src) modules += new /obj/item/gripper/paperwork(src) - modules += new /obj/item/device/flash(src) + modules += new /obj/item/flash(src) /mob/living/silicon/robot/shell spawn_module = /obj/item/robot_module/aicontrol diff --git a/code/modules/mob/living/silicon/pai/admin.dm b/code/modules/mob/living/silicon/pai/admin.dm index 5b9bedb7634..ad88582eeed 100644 --- a/code/modules/mob/living/silicon/pai/admin.dm +++ b/code/modules/mob/living/silicon/pai/admin.dm @@ -21,7 +21,7 @@ pai_key = C.key log_and_message_admins("made a pAI with key=[pai_key] at ([t.x],[t.y],[t.z])") - var/obj/item/device/paicard/card = new(t) + var/obj/item/paicard/card = new(t) var/mob/living/silicon/pai/pai = new(card) pai.key = pai_key card.setPersonality(pai) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 53806ec14c9..b53c08aa450 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -16,8 +16,8 @@ var/ram = 100 // Used as currency to purchase different abilities var/list/software = list() var/userDNA // The DNA string of our assigned user - var/obj/item/device/paicard/card // The card we inhabit - var/obj/item/device/radio/pai/radio // Our primary radio + var/obj/item/paicard/card // The card we inhabit + var/obj/item/radio/pai/radio // Our primary radio var/chassis = "repairbot" // A record of your chosen chassis. @@ -96,7 +96,7 @@ var/hackprogress = 0 // Possible values: 0 - 1000, >= 1000 means the hack is complete and will be reset upon next check var/hack_aborted = 0 - var/obj/item/radio/integrated/signal/sradio // AI's signaller + var/obj/item/integrated_signaler/signal/sradio // AI's signaller var/translator_on = 0 // keeps track of the translator module @@ -156,11 +156,11 @@ P.set_light(light_range, light_power, light_color) /mob/living/silicon/pai/Initialize(mapload) - var/obj/item/device/paicard/paicard = loc + var/obj/item/paicard/paicard = loc if (!istype(paicard)) //If we get here, then we must have been created by adminspawning. //so lets assist with debugging by creating our own card and adding ourself to it - paicard = new /obj/item/device/paicard(loc) + paicard = new /obj/item/paicard(loc) paicard.pai = src canmove = 0 @@ -169,9 +169,9 @@ sradio = new(src) if(card) if(!card.radio) - card.radio = new /obj/item/device/radio/pai(src.card) + card.radio = new /obj/item/radio/pai(src.card) radio = card.radio - INVOKE_ASYNC(card, TYPE_PROC_REF(/obj/item/device/paicard, recalculateChannels)) + INVOKE_ASYNC(card, TYPE_PROC_REF(/obj/item/paicard, recalculateChannels)) //Default languages without universal translator software @@ -230,7 +230,7 @@ return 0 /mob/living/silicon/pai/restrained() - return !istype(loc, /obj/item/device/paicard) && ..() + return !istype(loc, /obj/item/paicard) && ..() /mob/living/silicon/pai/emp_act(severity) . = ..() @@ -289,7 +289,7 @@ /* // Debug command - Maybe should be added to admin verbs later /mob/verb/makePAI(var/turf/t in view()) - var/obj/item/device/paicard/card = new(t) + var/obj/item/paicard/card = new(t) var/mob/living/silicon/pai/pai = new(card) pai.key = src.key card.setPersonality(pai) @@ -418,7 +418,7 @@ set category = "IC.Maneuver" // Pass lying down or getting up to our pet human, if we're in a rig. - if(istype(src.loc,/obj/item/device/paicard)) + if(istype(src.loc,/obj/item/paicard)) resting = 0 var/obj/item/rig/rig = src.get_rig() if(istype(rig)) @@ -548,5 +548,5 @@ /mob/living/silicon/pai/set_respawn_time() set_death_time(MINISYNTH, world.time) -/obj/item/device/radio/pai +/obj/item/radio/pai canhear_range = 0 // only people on their tile diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index e76f45073fa..db9afbb3ef5 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -1,9 +1,9 @@ // //Robotic Component Analyzer, basically a health analyzer for robots // -/obj/item/device/robotanalyzer +/obj/item/robotanalyzer name = "cyborg analyzer" - icon = 'icons/obj/item/device/robotanalyzer.dmi' + icon = 'icons/obj/item/robotanalyzer.dmi' icon_state = "robotanalyzer" item_state = "analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." @@ -16,7 +16,7 @@ origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 1, TECH_ENGINEERING = 2) matter = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 200) -/obj/item/device/robotanalyzer/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/robotanalyzer/attack(mob/living/target_mob, mob/living/user, target_zone) robotic_analyze_mob(target_mob, user) add_fingerprint(user) @@ -132,19 +132,19 @@ else . = "minor" -/obj/item/device/robotanalyzer/augment +/obj/item/robotanalyzer/augment name = "retractable cyborg analyzer" desc = "An scanner implanted directly into the hand, popping through the finger. This scanner can diagnose robotic injuries." - icon = 'icons/obj/item/device/robotanalyzer.dmi' + icon = 'icons/obj/item/robotanalyzer.dmi' icon_state = "robotanalyzer" item_state = "analyzer" slot_flags = null w_class = WEIGHT_CLASS_HUGE -/obj/item/device/robotanalyzer/augment/throw_at(atom/target, range, speed, mob/user) +/obj/item/robotanalyzer/augment/throw_at(atom/target, range, speed, mob/user) user.drop_from_inventory(src) -/obj/item/device/robotanalyzer/augment/dropped() +/obj/item/robotanalyzer/augment/dropped() . = ..() loc = null qdel(src) diff --git a/code/modules/mob/living/silicon/robot/combat_robot.dm b/code/modules/mob/living/silicon/robot/combat_robot.dm index 110eee8efd2..f1fa80317f7 100644 --- a/code/modules/mob/living/silicon/robot/combat_robot.dm +++ b/code/modules/mob/living/silicon/robot/combat_robot.dm @@ -26,7 +26,7 @@ // ID and Access req_access = list(ACCESS_SYNDICATE) id_card_type = /obj/item/card/id/syndicate - key_type = /obj/item/device/encryptionkey/syndicate + key_type = /obj/item/encryptionkey/syndicate var/datum/antagonist/assigned_antagonist /mob/living/silicon/robot/combat/Initialize() @@ -45,7 +45,7 @@ assigned_antagonist.add_antagonist_mind(src.mind, TRUE) if(assigned_antagonist.get_antag_radio()) module.channels[assigned_antagonist.get_antag_radio()] = TRUE - INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/device/radio/borg, recalculateChannels)) + INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/radio/borg, recalculateChannels)) client.init_verbs() say("Boot sequence complete!") return src diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index e77e082e5f7..b7f081307d8 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -271,7 +271,7 @@ SSghostroles.add_spawn_atom("matriarchmaintdrone", src) /mob/living/silicon/robot/drone/init() - ai_camera = new /obj/item/device/camera/siliconcam/drone_camera(src) + ai_camera = new /obj/item/camera/siliconcam/drone_camera(src) additional_law_channels["Drone"] = ":d" if(!laws) laws = new law_type diff --git a/code/modules/mob/living/silicon/robot/items/gripper.dm b/code/modules/mob/living/silicon/robot/items/gripper.dm index b284c42db16..2e92c408b7e 100644 --- a/code/modules/mob/living/silicon/robot/items/gripper.dm +++ b/code/modules/mob/living/silicon/robot/items/gripper.dm @@ -22,7 +22,7 @@ /obj/item/tank, /obj/item/circuitboard, /obj/item/smes_coil, - /obj/item/device/assembly,//Primarily for making improved cameras, but opens many possibilities + /obj/item/assembly,//Primarily for making improved cameras, but opens many possibilities /obj/item/computer_hardware, /obj/item/pipe, /obj/item/smallDelivery, @@ -242,7 +242,7 @@ /obj/item/extraction_pack, /obj/item/smallDelivery, /obj/item/gift, - /obj/item/device/mine_bot_upgrade + /obj/item/mine_bot_upgrade ) /obj/item/gripper/paperwork @@ -276,26 +276,26 @@ can_hold = list( /obj/item/cell, /obj/item/stock_parts, - /obj/item/device/mmi, + /obj/item/mmi, /obj/item/robot_parts, /obj/item/mech_component, /obj/item/mecha_equipment, - /obj/item/device/radio/exosuit, + /obj/item/radio/exosuit, /obj/item/borg/upgrade, - /obj/item/device/flash, // to build borgs, + /obj/item/flash, // to build borgs, /obj/item/organ/internal/brain, // to insert into MMIs, /obj/item/stack/cable_coil, // again, for borg building, /obj/item/circuitboard, /obj/item/slime_extract, - /obj/item/device/slime_scanner, + /obj/item/slime_scanner, /obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/snacks/monkeycube, /obj/item/seeds, // To be able to plant things for Xenobotany /obj/item/grown, // To be able to plant things for Xenobotany - /obj/item/device/assembly, // For building bots and similar complex R&D devices - /obj/item/device/healthanalyzer,// For building medibots + /obj/item/assembly, // For building bots and similar complex R&D devices + /obj/item/healthanalyzer,// For building medibots /obj/item/disk, - /obj/item/device/analyzer/plant_analyzer,//For farmbot construction + /obj/item/analyzer/plant_analyzer,//For farmbot construction /obj/item/material/minihoe, // Farmbots and xenoflora /obj/item/computer_hardware, /obj/item/slimesteroid, @@ -305,7 +305,7 @@ /obj/item/remote_mecha, /obj/item/smallDelivery, /obj/item/gift, - /obj/item/device/integrated_circuit_printer + /obj/item/integrated_circuit_printer ) /obj/item/gripper/chemistry //A gripper designed for chemistry, to allow borgs to work efficiently in the lab @@ -324,7 +324,7 @@ /obj/item/reagent_containers/inhaler, /obj/item/reagent_containers/hypospray, /obj/item/storage/pill_bottle, - /obj/item/device/hand_labeler, + /obj/item/hand_labeler, /obj/item/paper, /obj/item/stack/material/phoron, /obj/item/reagent_containers/blood, diff --git a/code/modules/mob/living/silicon/robot/items/modules/robot_shield.dm b/code/modules/mob/living/silicon/robot/items/modules/robot_shield.dm index 3462cb5b1e0..ff6c2f35a1b 100644 --- a/code/modules/mob/living/silicon/robot/items/modules/robot_shield.dm +++ b/code/modules/mob/living/silicon/robot/items/modules/robot_shield.dm @@ -2,7 +2,7 @@ /obj/item/borg/combat/shield name = "personal shielding" desc = "A powerful experimental module that turns aside or absorbs incoming attacks at the cost of charge." - icon = 'icons/obj/item/device/chameleon.dmi' + icon = 'icons/obj/item/chameleon.dmi' icon_state = "shield1" //placeholder for now // four fucking years alberyk. FOUR var/shield_level = 0.5 //Percentage of damage absorbed by the shield. diff --git a/code/modules/mob/living/silicon/robot/items/robot_parts.dm b/code/modules/mob/living/silicon/robot/items/robot_parts.dm index 50cddeb9a27..ccc479e3ca1 100644 --- a/code/modules/mob/living/silicon/robot/items/robot_parts.dm +++ b/code/modules/mob/living/silicon/robot/items/robot_parts.dm @@ -77,8 +77,8 @@ desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals." icon_state = "head" part = list(BP_HEAD) - var/obj/item/device/flash/left_flash = null - var/obj/item/device/flash/right_flash = null + var/obj/item/flash/left_flash = null + var/obj/item/flash/right_flash = null var/law_manager = TRUE /obj/item/robot_parts/robot_suit @@ -208,8 +208,8 @@ to_chat(user, SPAN_WARNING("You need to attach a flash to it first!")) return - if(istype(attacking_item, /obj/item/device/mmi/shell)) - var/obj/item/device/mmi/shell/M = attacking_item + if(istype(attacking_item, /obj/item/mmi/shell)) + var/obj/item/mmi/shell/M = attacking_item if(check_completion()) var/mob/living/silicon/robot/O = new /mob/living/silicon/robot/shell(get_turf(src), TRUE) if(!O) @@ -235,8 +235,8 @@ to_chat(user, SPAN_WARNING("\The [attacking_item] can only be inserted after everything else is installed.")) return - if(istype(attacking_item, /obj/item/device/mmi)) - var/obj/item/device/mmi/M = attacking_item + if(istype(attacking_item, /obj/item/mmi)) + var/obj/item/mmi/M = attacking_item if(check_completion()) if(!isturf(loc)) to_chat(user, SPAN_WARNING("You can't put \the [attacking_item] in, the frame has to be standing on the ground to be perfectly precise.")) @@ -280,7 +280,7 @@ return // So you cannot make a cyborg with a positronic in it. - if(istype(M, /obj/item/device/mmi/digital/posibrain)) + if(istype(M, /obj/item/mmi/digital/posibrain)) to_chat(user, SPAN_WARNING("Positronic brains are not compatible with this kind of chassis.")) return @@ -311,7 +311,7 @@ callHook("borgify", list(O)) O.Namepick() qdel(src) - else if(!istype(M, /obj/item/device/mmi/digital/posibrain)) + else if(!istype(M, /obj/item/mmi/digital/posibrain)) to_chat(user, SPAN_WARNING("\The [attacking_item] can only be inserted after everything else is installed.")) return @@ -367,8 +367,8 @@ /obj/item/robot_parts/head/attackby(obj/item/attacking_item, mob/user) ..() - if(istype(attacking_item, /obj/item/device/assembly/infra)) - var/obj/item/device/assembly/S = attacking_item + if(istype(attacking_item, /obj/item/assembly/infra)) + var/obj/item/assembly/S = attacking_item var/obj/item/tv_assembly/A = new(user) qdel(S) user.put_in_hands(A) @@ -383,10 +383,10 @@ to_chat(user, SPAN_NOTICE("You enable the lawing circuits on \the [src].")) law_manager = TRUE - else if(istype(attacking_item, /obj/item/device/flash)) + else if(istype(attacking_item, /obj/item/flash)) if(isrobot(user)) var/mob/living/silicon/robot/R = user - if(istype(R.module_active, /obj/item/device/flash)) + if(istype(R.module_active, /obj/item/flash)) to_chat(user, SPAN_WARNING("You cannot detach your own flash and install it into \the [src].")) return else diff --git a/code/modules/mob/living/silicon/robot/items/robot_tools.dm b/code/modules/mob/living/silicon/robot/items/robot_tools.dm index debe24c2cf5..0d26bd9dc0c 100644 --- a/code/modules/mob/living/silicon/robot/items/robot_tools.dm +++ b/code/modules/mob/living/silicon/robot/items/robot_tools.dm @@ -6,7 +6,7 @@ icon_state = "screwdriver" build_from_parts = FALSE -/obj/item/device/multitool/robotic +/obj/item/multitool/robotic icon = 'icons/obj/robot_items.dmi' /obj/item/wirecutters/robotic diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 7d6113b5b84..71eb8f9ddad 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -273,7 +273,7 @@ if(client) client.screen -= contents for(var/obj/I in contents) - if(I && !(istype(I, /obj/item/cell) || istype(I, /obj/item/device/radio) || istype(I, /obj/machinery/camera) || istype(I, /obj/item/device/mmi))) + if(I && !(istype(I, /obj/item/cell) || istype(I, /obj/item/radio) || istype(I, /obj/machinery/camera) || istype(I, /obj/item/mmi))) client.screen += I if(module_state_1) module_state_1.screen_loc = ui_inv1 diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm index dcf3dc7c176..f7e546fdf8e 100644 --- a/code/modules/mob/living/silicon/robot/photos.dm +++ b/code/modules/mob/living/silicon/robot/photos.dm @@ -1,5 +1,5 @@ /mob/living/silicon/robot/proc/photosync() - var/obj/item/device/camera/siliconcam/master_cam = connected_ai ? connected_ai.ai_camera : null + var/obj/item/camera/siliconcam/master_cam = connected_ai ? connected_ai.ai_camera : null if(!master_cam) return diff --git a/code/modules/mob/living/silicon/robot/presets.dm b/code/modules/mob/living/silicon/robot/presets.dm index cedd714fd28..88bf799d953 100644 --- a/code/modules/mob/living/silicon/robot/presets.dm +++ b/code/modules/mob/living/silicon/robot/presets.dm @@ -10,7 +10,7 @@ law_update = FALSE law_preset = /datum/ai_laws/conglomerate_aggressive id_card_type = /obj/item/card/id/ert - key_type = /obj/item/device/encryptionkey/ert + key_type = /obj/item/encryptionkey/ert has_jetpack = TRUE /mob/living/silicon/robot/scrambled //should not stand linked to the station or the ai diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 40599faf757..cab0ba3a595 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -80,9 +80,9 @@ // Internal components (non-datum) var/obj/item/cell/cell - var/obj/item/device/radio/borg/radio + var/obj/item/radio/borg/radio var/obj/machinery/camera/camera - var/obj/item/device/mmi/mmi + var/obj/item/mmi/mmi var/obj/item/stock_parts/matter_bin/storage var/obj/item/tank/jetpack/carbondioxide/synthetic/jetpack @@ -158,7 +158,7 @@ mmi.brainmob.real_name = src.name mmi.name = "[initial(mmi.name)]: [src.name]" - radio = new /obj/item/device/radio/borg(src) + radio = new /obj/item/radio/borg(src) common_radio = radio if(!camera) @@ -235,13 +235,13 @@ update_access() /mob/living/silicon/robot/proc/init() - ai_camera = new /obj/item/device/camera/siliconcam/robot_camera(src) + ai_camera = new /obj/item/camera/siliconcam/robot_camera(src) laws = new law_preset() if(spawn_module) new spawn_module(src, src) if(key_type) radio.keyslot = new key_type(radio) - INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/device/radio/borg, recalculateChannels)) + INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/radio/borg, recalculateChannels)) if(law_update) var/new_ai = select_active_ai_with_fewest_borgs() if(new_ai) @@ -368,7 +368,7 @@ if(prefix) mod_type = prefix - if(istype(mmi, /obj/item/device/mmi/digital/robot)) + if(istype(mmi, /obj/item/mmi/digital/robot)) braintype = "Robot" else braintype = "Cyborg" @@ -754,7 +754,7 @@ else to_chat(user, SPAN_WARNING("\The [src] does not have a radio installed!")) return - else if(istype(attacking_item, /obj/item/device/encryptionkey) && opened) + else if(istype(attacking_item, /obj/item/encryptionkey) && opened) if(radio) //sanityyyyyy radio.attackby(attacking_item, user) //GTFO, you have your own procs else @@ -789,7 +789,7 @@ user.drop_from_inventory(U, src) return else - if(attacking_item.force && !(istype(attacking_item, /obj/item/device/robotanalyzer) || istype(attacking_item, /obj/item/device/healthanalyzer)) ) + if(attacking_item.force && !(istype(attacking_item, /obj/item/robotanalyzer) || istype(attacking_item, /obj/item/healthanalyzer)) ) spark_system.queue() return ..() else diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 61fb93e8744..74fb65fca4e 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(robot_modules, list( apply_status_flags(R) if(R.radio) - INVOKE_ASYNC(R.radio, TYPE_PROC_REF(/obj/item/device/radio/borg, recalculateChannels)) + INVOKE_ASYNC(R.radio, TYPE_PROC_REF(/obj/item/radio/borg, recalculateChannels)) R.set_module_sprites(sprites) R.icon_selected = FALSE @@ -115,7 +115,7 @@ GLOBAL_LIST_INIT(robot_modules, list( /obj/item/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate) var/obj/item/extinguisher/E = locate() in modules - var/obj/item/device/flash/F = locate() in modules + var/obj/item/flash/F = locate() in modules if(F) if(F.broken) F.broken = FALSE @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(robot_modules, list( /obj/item/robot_module/medical/general/Initialize() . = ..() - modules += new /obj/item/device/healthanalyzer(src) + modules += new /obj/item/healthanalyzer(src) modules += new /obj/item/reagent_containers/hypospray/borghypo/medical(src) modules += new /obj/item/surgery/scalpel(src) modules += new /obj/item/surgery/hemostat(src) @@ -231,16 +231,16 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/reagent_containers/dropper/cyborg_pipette(src) modules += new /obj/item/roller_holder(src) modules += new /obj/item/reagent_containers/syringe/robotic(src) - modules += new /obj/item/device/reagent_scanner/adv(src) - modules += new /obj/item/device/mass_spectrometer(src) + modules += new /obj/item/reagent_scanner/adv(src) + modules += new /obj/item/mass_spectrometer(src) modules += new /obj/item/autopsy_scanner(src) - modules += new /obj/item/device/breath_analyzer(src) + modules += new /obj/item/breath_analyzer(src) modules += new /obj/item/taperoll/medical(src) modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. emag = new /obj/item/reagent_containers/hypospray/cmo(src) emag.reagents.add_reagent(/singleton/reagent/wulumunusha, 30) @@ -279,10 +279,10 @@ GLOBAL_LIST_INIT(robot_modules, list( /obj/item/robot_module/medical/rescue/Initialize() . = ..() - modules += new /obj/item/device/healthanalyzer(src) - modules += new /obj/item/device/reagent_scanner/adv(src) - modules += new /obj/item/device/mass_spectrometer(src) - modules += new /obj/item/device/breath_analyzer(src) + modules += new /obj/item/healthanalyzer(src) + modules += new /obj/item/reagent_scanner/adv(src) + modules += new /obj/item/mass_spectrometer(src) + modules += new /obj/item/breath_analyzer(src) modules += new /obj/item/roller_holder(src) modules += new /obj/item/reagent_containers/hypospray/borghypo/rescue(src) modules += new /obj/item/reagent_containers/dropper/cyborg_pipette(src) @@ -293,9 +293,9 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/taperoll/medical(src) modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/gripper/paperwork(src) emag = new /obj/item/reagent_containers/hypospray/cmo(src) @@ -372,19 +372,19 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/screwdriver/robotic(src) modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/weldingtool/experimental(src) - modules += new /obj/item/device/pipe_painter(src) + modules += new /obj/item/pipe_painter(src) modules += new /obj/item/gripper/no_use/loader(src) modules += new /obj/item/gripper(src) - modules += new /obj/item/device/t_scanner(src) // to check underfloor wiring - modules += new /obj/item/device/analyzer(src) // to check air pressure in the area - modules += new /obj/item/device/lightreplacer(src) // to install lightning in the area - modules += new /obj/item/device/paint_sprayer(src)// to make america great again (c) + modules += new /obj/item/t_scanner(src) // to check underfloor wiring + modules += new /obj/item/analyzer(src) // to check air pressure in the area + modules += new /obj/item/lightreplacer(src) // to install lightning in the area + modules += new /obj/item/paint_sprayer(src)// to make america great again (c) modules += new /obj/item/pickaxe/borgdrill(src) // as station is being located at the rock terrain, which is presumed to be digged out to clear the area for new rooms modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/pen/robopen(src) // Pen for renaming doors emag = new /obj/item/gun/energy/plasmacutter/mounted(src) @@ -436,20 +436,20 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/screwdriver/robotic(src) modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/wirecutters/robotic(src) - modules += new /obj/item/device/multitool/robotic(src) + modules += new /obj/item/multitool/robotic(src) modules += new /obj/item/rfd/piping/borg(src) - modules += new /obj/item/device/t_scanner(src) - modules += new /obj/item/device/analyzer(src) + modules += new /obj/item/t_scanner(src) + modules += new /obj/item/analyzer(src) modules += new /obj/item/gripper(src) modules += new /obj/item/gripper/no_use/loader(src) - modules += new /obj/item/device/lightreplacer(src) - modules += new /obj/item/device/pipe_painter(src) - modules += new /obj/item/device/paint_sprayer(src) + modules += new /obj/item/lightreplacer(src) + modules += new /obj/item/pipe_painter(src) + modules += new /obj/item/paint_sprayer(src) modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/pen/robopen(src) // Pen for renaming doors emag = new /obj/item/melee/baton/robot/arm(src) @@ -564,14 +564,14 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/soap/drone(src) modules += new /obj/item/storage/bag/trash(src) modules += new /obj/item/mop(src) - modules += new /obj/item/device/lightreplacer/advanced(src) + modules += new /obj/item/lightreplacer/advanced(src) modules += new /obj/item/reagent_containers/glass/bucket(src) // a hydroponist's bucket modules += new /obj/item/matter_decompiler(src) // free drone remains for all modules += new /obj/item/taperoll/custodial(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/wetfloor_holder(src) // Holds caution signs. emag = new /obj/item/reagent_containers/spray(src) @@ -604,7 +604,7 @@ GLOBAL_LIST_INIT(robot_modules, list( /obj/item/robot_module/janitor/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) ..() - var/obj/item/device/lightreplacer/LR = locate() in modules + var/obj/item/lightreplacer/LR = locate() in modules LR.Charge(R, amount) if(emag) var/obj/item/reagent_containers/spray/S = emag @@ -661,7 +661,7 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/reagent_containers/glass/bucket(src) modules += new /obj/item/material/minihoe(src) modules += new /obj/item/material/hatchet(src) - modules += new /obj/item/device/analyzer/plant_analyzer(src) + modules += new /obj/item/analyzer/plant_analyzer(src) modules += new /obj/item/storage/bag/plants(src) modules += new /obj/item/robot_harvester(src) modules += new /obj/item/material/kitchen/rollingpin(src) @@ -670,15 +670,15 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/pen/robopen(src) modules += new /obj/item/form_printer(src) modules += new /obj/item/gripper/paperwork(src) - modules += new /obj/item/device/hand_labeler(src) + modules += new /obj/item/hand_labeler(src) modules += new /obj/item/tape_roll(src) //allows it to place flyers - modules += new /obj/item/device/quikpay(src) + modules += new /obj/item/quikpay(src) modules += new /obj/item/reagent_containers/glass/rag(src) // a rag for.. yeah.. the primary tool of bartender modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. var/obj/item/rfd/service/M = new /obj/item/rfd/service(src) @@ -712,18 +712,18 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/pen/robopen(src) modules += new /obj/item/form_printer(src) modules += new /obj/item/gripper/paperwork(src) - modules += new /obj/item/device/hand_labeler(src) - modules += new /obj/item/device/destTagger(src) + modules += new /obj/item/hand_labeler(src) + modules += new /obj/item/destTagger(src) modules += new /obj/item/stamp(src) modules += new /obj/item/stamp/denied(src) modules += new /obj/item/tape_roll(src) //allows it to place flyers - modules += new /obj/item/device/quikpay(src) + modules += new /obj/item/quikpay(src) modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/taperoll/police(src) modules += new /obj/item/paper_scanner(src) //TODO: Add functionality to allow for scanned paperwork to show up in internal computer - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. emag = new /obj/item/stamp/chameleon(src) @@ -766,13 +766,13 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/mining_scanner(src) modules += new /obj/item/ore_radar(src) modules += new /obj/item/gripper/paperwork(src) // for Yield Declarations - modules += new /obj/item/device/gps/mining(src) // for locating itself in the deep space + modules += new /obj/item/gps/mining(src) // for locating itself in the deep space modules += new /obj/item/gun/custom_ka/cyborg(src) modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/screwdriver/robotic(src) @@ -827,7 +827,7 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/gripper/research(src) modules += new /obj/item/robot_harvester(src) modules += new /obj/item/gripper/no_use/loader(src) - modules += new /obj/item/device/robotanalyzer(src) + modules += new /obj/item/robotanalyzer(src) modules += new /obj/item/card/robot(src) var/datum/matter_synth/wire = new /datum/matter_synth/wire(15) @@ -845,17 +845,17 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/reagent_containers/syringe(src) modules += new /obj/item/gripper/chemistry(src) modules += new /obj/item/reagent_containers/dropper/cyborg_pipette(src) - modules += new /obj/item/device/reagent_scanner/adv(src) + modules += new /obj/item/reagent_scanner/adv(src) modules += new /obj/item/storage/bag/plants(src) modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually. modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. - modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles. + modules += new /obj/item/gps(src) // For being located while disabled and coordinating with life sensor consoles. modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/pen/robopen(src) // Pen for renaming robots modules += new /obj/item/storage/part_replacer(src) - modules += new /obj/item/device/multitool/robotic(src) // To enable them to connect machines that require multitools e.g. tech-processors + modules += new /obj/item/multitool/robotic(src) // To enable them to connect machines that require multitools e.g. tech-processors emag = new /obj/item/hand_tele(src) var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000) @@ -929,17 +929,17 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/handcuffs/cyborg(src) modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. modules += new /obj/item/roller_holder(src) - modules += new /obj/item/device/healthanalyzer(src) + modules += new /obj/item/healthanalyzer(src) modules += new /obj/item/reagent_containers/hypospray/borghypo/medical(src) modules += new /obj/item/plastique/cyborg(src) modules += new /obj/item/grenade/smokebomb/cyborg(src) supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack) if(R.radio) - INVOKE_ASYNC(R.radio, TYPE_PROC_REF(/obj/item/device/radio/borg, recalculateChannels)) + INVOKE_ASYNC(R.radio, TYPE_PROC_REF(/obj/item/radio/borg, recalculateChannels)) /obj/item/robot_module/military name = "military robot module" @@ -962,7 +962,7 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/handcuffs/cyborg(src) modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards. modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful. - modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. + modules += new /obj/item/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws. modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to. emag = new /obj/item/gun/energy/lasercannon/mounted(src) @@ -979,14 +979,14 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/crowbar/robotic(src) modules += new /obj/item/wirecutters/robotic(src) - modules += new /obj/item/device/multitool/robotic(src) + modules += new /obj/item/multitool/robotic(src) modules += new /obj/item/taperoll/engineering(src) - modules += new /obj/item/device/lightreplacer(src) + modules += new /obj/item/lightreplacer(src) modules += new /obj/item/soap/drone(src) modules += new /obj/item/extinguisher(src) - modules += new /obj/item/device/pipe_painter(src) - modules += new /obj/item/device/paint_sprayer(src) - modules += new /obj/item/device/t_scanner(src) + modules += new /obj/item/pipe_painter(src) + modules += new /obj/item/paint_sprayer(src) + modules += new /obj/item/t_scanner(src) modules += new /obj/item/gripper/multi_purpose(src) modules += new /obj/item/gripper/no_use/loader(src) @@ -1055,7 +1055,7 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/rfd/piping/borg(src) // putting this here so it's next to the RFD-C on construction drones /obj/item/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) - var/obj/item/device/lightreplacer/LR = locate() in src.modules + var/obj/item/lightreplacer/LR = locate() in src.modules LR.Charge(R, amount) return ..() @@ -1100,7 +1100,7 @@ GLOBAL_LIST_INIT(robot_modules, list( languages[LANGUAGE_LOCAL_DRONE] = TRUE /obj/item/robot_module/mining_drone/proc/set_up_default(var/mob/living/silicon/robot/R, var/has_drill = TRUE) - modules += new /obj/item/device/flash(src) + modules += new /obj/item/flash(src) if(has_drill) modules += new /obj/item/pickaxe/drill(src) modules += new /obj/item/storage/bag/ore/drone(src) @@ -1109,7 +1109,7 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/screwdriver/robotic(src) modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/mining_scanner(src) - modules += new /obj/item/device/gps/mining(src) + modules += new /obj/item/gps/mining(src) modules += new /obj/item/tank/jetpack/carbondioxide(src) modules += new /obj/item/rfd/mining(src) modules += new /obj/item/tethering_device(src) @@ -1182,7 +1182,7 @@ GLOBAL_LIST_INIT(robot_modules, list( /obj/item/robot_module/bluespace/Initialize(mapload, mob/living/silicon/robot/R) . = ..() - modules += new /obj/item/device/flash(src) + modules += new /obj/item/flash(src) modules += new /obj/item/borg/sight/meson(src) modules += new /obj/item/rfd/construction/borg/infinite(src) modules += new /obj/item/extinguisher(src) @@ -1191,15 +1191,15 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/crowbar/robotic(src) modules += new /obj/item/wirecutters/robotic(src) - modules += new /obj/item/device/multitool/robotic(src) - modules += new /obj/item/device/t_scanner(src) - modules += new /obj/item/device/analyzer(src) + modules += new /obj/item/multitool/robotic(src) + modules += new /obj/item/t_scanner(src) + modules += new /obj/item/analyzer(src) modules += new /obj/item/gripper(src) modules += new /obj/item/gripper/no_use/loader(src) - modules += new /obj/item/device/lightreplacer(src) + modules += new /obj/item/lightreplacer(src) modules += new /obj/item/inflatable_dispenser(src) // Medical - modules += new /obj/item/device/healthanalyzer(src) + modules += new /obj/item/healthanalyzer(src) modules += new /obj/item/reagent_containers/hypospray/borghypo/medical(src) modules += new /obj/item/surgery/scalpel(src) modules += new /obj/item/surgery/hemostat(src) @@ -1345,9 +1345,9 @@ GLOBAL_LIST_INIT(robot_modules, list( modules += new /obj/item/wrench/robotic(src) modules += new /obj/item/crowbar/robotic(src) modules += new /obj/item/wirecutters/robotic(src) - modules += new /obj/item/device/multitool/robotic(src) - modules += new /obj/item/device/analyzer(src) - modules += new /obj/item/device/healthanalyzer(src) + modules += new /obj/item/multitool/robotic(src) + modules += new /obj/item/analyzer(src) + modules += new /obj/item/healthanalyzer(src) modules += new /obj/item/borg/sight/thermal(src) modules += new /obj/item/gun/energy/pulse/mounted(src) modules += new /obj/item/gun/energy/lasercannon/mounted/cyborg/overclocked(src) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 46c9a136989..b04ff0d44d6 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -19,7 +19,7 @@ var/law_channel = DEFAULT_LAW_CHANNEL var/list/additional_law_channels = list("State" = "") var/list/stating_laws = list() // Channels laws are currently being stated on - var/obj/item/device/radio/common_radio // Used to determine default channels + var/obj/item/radio/common_radio // Used to determine default channels // Hud Stuff var/list/hud_list[10] @@ -38,7 +38,7 @@ ) // Utility - var/obj/item/device/camera/siliconcam/ai_camera //photography + var/obj/item/camera/siliconcam/ai_camera //photography // ID and Access var/list/access_rights diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index 5b98c197e6a..1720ab401bf 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -1,7 +1,7 @@ -/obj/item/device/soulstone/cultify() +/obj/item/soulstone/cultify() return -/obj/item/device/soulstone +/obj/item/soulstone name = "soul stone shard" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." icon = 'icons/obj/wizard.dmi' @@ -15,7 +15,7 @@ //////////////////////////////Capturing//////////////////////////////////////////////////////// -/obj/item/device/soulstone/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/soulstone/attack(mob/living/target_mob, mob/living/user, target_zone) user.setClickCooldown(20) var/mob/living/carbon/human/M = target_mob @@ -39,7 +39,7 @@ ///////////////////Options for using captured souls/////////////////////////////////////// -/obj/item/device/soulstone/attack_self(mob/user) +/obj/item/soulstone/attack_self(mob/user) if(!in_range(src, user)) return user.set_machine(src) @@ -56,7 +56,7 @@ soulstone_win.add_stylesheet("cult", 'html/browser/cult.css') soulstone_win.open() -/obj/item/device/soulstone/Topic(href, href_list) +/obj/item/soulstone/Topic(href, href_list) var/mob/U = usr if (!in_range(src, U)||U.machine!=src) U << browse(null, "window=soulstone") @@ -98,13 +98,13 @@ desc = "This eerie contraption looks like it would come alive if supplied with a missing ingredient." /obj/structure/constructshell/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/soulstone)) - var/obj/item/device/soulstone/S = attacking_item + if(istype(attacking_item, /obj/item/soulstone)) + var/obj/item/soulstone/S = attacking_item S.transfer_soul("CONSTRUCT",src,user) ////////////////////////////Proc for moving soul in and out off stone////////////////////////////////////// -/obj/item/device/soulstone/proc/transfer_human(var/mob/living/carbon/human/T,var/mob/U) +/obj/item/soulstone/proc/transfer_human(var/mob/living/carbon/human/T,var/mob/U) if(!istype(T)) return if(src.imprinted != "empty") @@ -154,7 +154,7 @@ src.imprinted = "[S.name]" qdel(T) -/obj/item/device/soulstone/proc/transfer_shade(var/mob/living/simple_animal/shade/T,var/mob/U) +/obj/item/soulstone/proc/transfer_shade(var/mob/living/simple_animal/shade/T,var/mob/U) if(!istype(T)) return; if (T.stat == DEAD) @@ -176,7 +176,7 @@ to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") to_chat(U, "Capture successful! : [T.name]'s has been recaptured and stored within the soul stone.") -/obj/item/device/soulstone/proc/transfer_construct(var/obj/structure/constructshell/T,var/mob/U) +/obj/item/soulstone/proc/transfer_construct(var/obj/structure/constructshell/T,var/mob/U) var/mob/living/simple_animal/shade/A = locate() in src if(!A) to_chat(U, "Capture failed!: The soul stone is empty! Go kill someone!") @@ -220,7 +220,7 @@ Z.cancel_camera() qdel(src) -/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob) +/obj/item/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob) switch(choice) if("VICTIM") transfer_human(target,U) diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 6215aade1f2..0a5cd8d4d05 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -91,7 +91,7 @@ corpsesuit = /obj/item/clothing/suit/armor/vest corpseshoes = /obj/item/clothing/shoes/combat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas corpsehelmet = /obj/item/clothing/head/helmet/swat corpseback = /obj/item/storage/backpack @@ -108,7 +108,7 @@ corpsesuit = /obj/item/clothing/suit/space/void/merc corpseshoes = /obj/item/clothing/shoes/combat corpsegloves = /obj/item/clothing/gloves/swat - corpseradio = /obj/item/device/radio/headset + corpseradio = /obj/item/radio/headset corpsemask = /obj/item/clothing/mask/gas/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/void/merc corpseback = /obj/item/tank/jetpack/oxygen diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index e7cf099923d..52ea370b9a0 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -7,12 +7,12 @@ maxbodytemp = 500 mob_size = MOB_TINY - var/radio_type = /obj/item/device/radio/borg - var/obj/item/device/radio/borg/radio = null + var/radio_type = /obj/item/radio/borg + var/obj/item/radio/borg/radio = null var/mob/living/silicon/ai/connected_ai = null var/obj/item/cell/cell = null var/obj/machinery/camera/camera = null - var/obj/item/device/mmi/mmi = null + var/obj/item/mmi/mmi = null var/obj/item/card/id/internal_id = null var/list/req_access = list(ACCESS_ROBOTICS) //Access needed to pop out the brain. var/positronic @@ -79,8 +79,8 @@ /mob/living/simple_animal/spiderbot/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/mmi)) - var/obj/item/device/mmi/B = attacking_item + if(istype(attacking_item, /obj/item/mmi)) + var/obj/item/mmi/B = attacking_item if(src.mmi) to_chat(user, SPAN_WARNING("There's already a brain in [src]!")) return @@ -108,7 +108,7 @@ to_chat(user, SPAN_NOTICE("You install \the [attacking_item] in \the [src]!")) - if(istype(attacking_item, /obj/item/device/mmi/digital)) + if(istype(attacking_item, /obj/item/mmi/digital)) positronic = 1 add_language("Robot Talk") @@ -183,7 +183,7 @@ spawn(200) to_chat(src, SPAN_DANGER("Internal heat sensors are spiking! Something is badly wrong with your cell!")) spawn(300) src.explode() -/mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/device/mmi/M as obj) +/mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/mmi/M as obj) src.mind = M.brainmob.mind src.mind.key = M.brainmob.key src.ckey = M.brainmob.ckey @@ -354,7 +354,7 @@ used_radios += radio if("intercom") var/turf/T = get_turf(src) - for(var/obj/item/device/radio/intercom/I in view(1, T)) + for(var/obj/item/radio/intercom/I in view(1, T)) I.talk_into(src, message, null, verb, speaking) used_radios += I if(message_mode) @@ -371,7 +371,7 @@ radio.interact(src) /mob/living/simple_animal/spiderbot/ai - radio_type = /obj/item/device/radio/headset/heads/ai_integrated + radio_type = /obj/item/radio/headset/heads/ai_integrated /mob/living/simple_animal/spiderbot/ai/Initialize() . = ..() diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index cb8438ff572..8c55741ce5f 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -65,7 +65,7 @@ var/list/speech_buffer = list() var/list/available_channels = list() - var/obj/item/device/radio/headset/ears = null + var/obj/item/radio/headset/ears = null //The thing the parrot is currently interested in. This gets used for items the parrot wants to pick up, mobs it wants to steal from, //mobs it wants to attack or mobs that have attacked it @@ -90,11 +90,11 @@ /mob/living/simple_animal/parrot/Initialize() . = ..() if(!ears) - var/headset = pick(/obj/item/device/radio/headset/headset_sec, \ - /obj/item/device/radio/headset/headset_eng, \ - /obj/item/device/radio/headset/headset_med, \ - /obj/item/device/radio/headset/headset_sci, \ - /obj/item/device/radio/headset/headset_cargo) + var/headset = pick(/obj/item/radio/headset/headset_sec, \ + /obj/item/radio/headset/headset_eng, \ + /obj/item/radio/headset/headset_med, \ + /obj/item/radio/headset/headset_sci, \ + /obj/item/radio/headset/headset_cargo) ears = new headset(src) parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var @@ -184,11 +184,11 @@ if(!item_to_add) return - if( !istype(item_to_add, /obj/item/device/radio/headset) ) + if( !istype(item_to_add, /obj/item/radio/headset) ) to_chat(usr, SPAN_WARNING("This object won't fit.")) return - var/obj/item/device/radio/headset/headset_to_add = item_to_add + var/obj/item/radio/headset/headset_to_add = item_to_add usr.drop_from_inventory(headset_to_add,src) src.ears = headset_to_add @@ -707,7 +707,7 @@ if(message_mode) if(message_mode in radiochannels) - if(ears && istype(ears,/obj/item/device/radio)) + if(ears && istype(ears,/obj/item/radio)) ears.talk_into(src,sanitize(message), message_mode, verb, null) diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index ff6bce238e6..70ea0dc296a 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -52,8 +52,8 @@ return FALSE /mob/living/simple_animal/shade/attackby(obj/item/attacking_item, mob/user) //Marker -Agouri - if(istype(attacking_item, /obj/item/device/soulstone)) - var/obj/item/device/soulstone/S = attacking_item + if(istype(attacking_item, /obj/item/soulstone)) + var/obj/item/soulstone/S = attacking_item S.transfer_soul("SHADE", src, user) return return ..() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b75fda8d510..7fe2d7a587a 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -28,7 +28,7 @@ /proc/isMMI(A) if(isbrain(A)) var/mob/living/carbon/brain/B = A - return istype(B.container, /obj/item/device/mmi) + return istype(B.container, /obj/item/mmi) /mob/living/bot/isSynthetic() return 1 diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 9b3e822eec0..78da50f356c 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -192,9 +192,9 @@ O.job = "Cyborg" if(O.mind.assigned_role == "Cyborg") if(O.mind.role_alt_title == "Robot") - O.mmi = new /obj/item/device/mmi/digital/robot(O) + O.mmi = new /obj/item/mmi/digital/robot(O) else - O.mmi = new /obj/item/device/mmi(O) + O.mmi = new /obj/item/mmi(O) O.mmi.transfer_identity(src) diff --git a/code/modules/modular_computers/computers/modular_computer/hardware.dm b/code/modules/modular_computers/computers/modular_computer/hardware.dm index 7918541f68d..7530551ba81 100644 --- a/code/modules/modular_computers/computers/modular_computer/hardware.dm +++ b/code/modules/modular_computers/computers/modular_computer/hardware.dm @@ -61,7 +61,7 @@ return found = TRUE tesla_link = H - else if(istype(H, /obj/item/device/paicard)) + else if(istype(H, /obj/item/paicard)) if(personal_ai) to_chat(user, SPAN_WARNING("\The [src]'s personal AI slot is already occupied by \the [personal_ai].")) return diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 2192376fd04..8e77e908877 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -280,7 +280,7 @@ else to_chat(user, SPAN_WARNING("This component is too large for \the [src].")) return TRUE - if(istype(attacking_item, /obj/item/device/paicard)) + if(istype(attacking_item, /obj/item/paicard)) try_install_component(user, attacking_item) return TRUE if(attacking_item.tool_behaviour == TOOL_WRENCH) diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm index 60144420618..e093253646e 100644 --- a/code/modules/modular_computers/computers/modular_computer/variables.dm +++ b/code/modules/modular_computers/computers/modular_computer/variables.dm @@ -124,7 +124,7 @@ /// Tesla Link, Allows remote charging from nearest APC. var/obj/item/computer_hardware/tesla_link/tesla_link /// Personal AI, can control the device via a verb when installed - var/obj/item/device/paicard/personal_ai + var/obj/item/paicard/personal_ai /// The universal port. Allows connection from IPCs through access cables. var/obj/item/computer_hardware/universal_port/universal_port /// The access cable dongle. Allows the computer to have its very own access cable. diff --git a/code/modules/modular_computers/file_system/programs/command/teleporter.dm b/code/modules/modular_computers/file_system/programs/command/teleporter.dm index b05887c48ce..2942487d4c3 100644 --- a/code/modules/modular_computers/file_system/programs/command/teleporter.dm +++ b/code/modules/modular_computers/file_system/programs/command/teleporter.dm @@ -56,7 +56,7 @@ var/list/area_index = list() var/list/teleport_beacon_info = list() - for(var/obj/item/device/radio/beacon/R as anything in GLOB.teleportbeacons) + for(var/obj/item/radio/beacon/R as anything in GLOB.teleportbeacons) var/turf/BT = get_turf(R) if(!BT) continue diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index b9d599a9b4e..a6d38bdbcad 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -196,7 +196,7 @@ if(action == "ringtone") var/new_ringtone = params["ringtone"] - var/obj/item/device/uplink/hidden/H = computer.hidden_uplink + var/obj/item/uplink/hidden/H = computer.hidden_uplink if(istype(H) && H.check_trigger(usr, lowertext(new_ringtone), lowertext(H.pda_code))) to_chat(usr, SPAN_NOTICE("\The [computer] softly beeps.")) syndi_auth = TRUE diff --git a/code/modules/modular_computers/file_system/programs/security/guntracker.dm b/code/modules/modular_computers/file_system/programs/security/guntracker.dm index 3f92b61d01b..f3c3e12cc46 100644 --- a/code/modules/modular_computers/file_system/programs/security/guntracker.dm +++ b/code/modules/modular_computers/file_system/programs/security/guntracker.dm @@ -30,7 +30,7 @@ LAZYCLEARLIST(wireless_firing_pins_data) for(var/i in GLOB.wireless_firing_pins) - var/obj/item/device/firing_pin/wireless/P = i + var/obj/item/firing_pin/wireless/P = i if(!istype(P) || !P.gun) continue var/turf/Ts = get_turf(P) @@ -53,7 +53,7 @@ return //Try and get the pin if a pin is passed - var/obj/item/device/firing_pin/wireless/P + var/obj/item/firing_pin/wireless/P if(params["pin"]) P = locate(params["pin"]) in GLOB.wireless_firing_pins diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index a4c8beabc45..d8ccff78002 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -13,7 +13,7 @@ var/list/allowed_items = list( /obj/item/pen, /obj/item/lipstick, - /obj/item/device/flashlight/pen, + /obj/item/flashlight/pen, /obj/item/clothing/mask/smokable/cigarette ) var/obj/item/stored_item // Used for pen insertion and removal. diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 7e1d7b27b97..182fa048843 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -12,7 +12,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user. var/long_range = FALSE var/ethernet = FALSE // Hard-wired, therefore always on, ignores NTNet wireless checks. - var/obj/item/radio/integrated/signal/sradio = FALSE // integrated signaler - not present on basic model. + var/obj/item/integrated_signaler/signal/sradio = FALSE // integrated signaler - not present on basic model. malfunction_probability = 1 /obj/item/computer_hardware/network_card/diagnostics(mob/user) @@ -41,7 +41,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) /obj/item/computer_hardware/network_card/signaler/Initialize() . = ..() - sradio = new /obj/item/radio/integrated/signal(src) + sradio = new /obj/item/integrated_signaler/signal(src) /obj/item/computer_hardware/network_card/advanced name = "advanced NTNet network card" @@ -54,7 +54,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) /obj/item/computer_hardware/network_card/advanced/Initialize() . = ..() - sradio = new /obj/item/radio/integrated/signal(src) + sradio = new /obj/item/integrated_signaler/signal(src) /obj/item/computer_hardware/network_card/wired name = "wired NTNet network card" @@ -67,7 +67,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) /obj/item/computer_hardware/network_card/wired/Initialize() . = ..() - sradio = new /obj/item/radio/integrated/signal(src) + sradio = new /obj/item/integrated_signaler/signal(src) // Returns a string identifier of this network card /obj/item/computer_hardware/network_card/proc/get_network_tag() diff --git a/code/modules/organs/internal/species/machine/posibrain.dm b/code/modules/organs/internal/species/machine/posibrain.dm index 12fa99a1602..4b150ab9b66 100644 --- a/code/modules/organs/internal/species/machine/posibrain.dm +++ b/code/modules/organs/internal/species/machine/posibrain.dm @@ -15,10 +15,10 @@ relative_size = 85 - /// The type of 'robotic brain'. Must be a subtype of /obj/item/device/mmi/digital. - var/robotic_brain_type = /obj/item/device/mmi/digital/posibrain + /// The type of 'robotic brain'. Must be a subtype of /obj/item/mmi/digital. + var/robotic_brain_type = /obj/item/mmi/digital/posibrain /// The stored MMI object. - var/obj/item/device/mmi/stored_mmi + var/obj/item/mmi/stored_mmi /// The cooldown between each alarm warning. var/heat_alarm_cooldown = 0 /// The cooldown between each integrity alarm warning. @@ -487,7 +487,7 @@ /obj/item/organ/internal/machine/posibrain/circuit name = "robotic intelligence circuit" desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science." - robotic_brain_type = /obj/item/device/mmi/digital/robot + robotic_brain_type = /obj/item/mmi/digital/robot /obj/item/organ/internal/machine/posibrain/terminator name = "advanced positronic brain" diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 3f241574fac..ca501edffca 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -150,7 +150,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) if(status & ORGAN_DEAD) return // Don't process if we're in a freezer, an MMI or a stasis bag.or a freezer or something I dunno - if(istype(loc,/obj/item/device/mmi)) + if(istype(loc,/obj/item/mmi)) return if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/storage/box/unique/freezer)) return diff --git a/code/modules/organs/subtypes/augment/augments/cybrong_analyzer.dm b/code/modules/organs/subtypes/augment/augments/cybrong_analyzer.dm index 190fcb6f639..3809bc5aa1f 100644 --- a/code/modules/organs/subtypes/augment/augments/cybrong_analyzer.dm +++ b/code/modules/organs/subtypes/augment/augments/cybrong_analyzer.dm @@ -5,7 +5,7 @@ action_button_icon = "augment-tool" organ_tag = BP_AUG_CYBORG_ANALYZER parent_organ = BP_R_HAND - augment_type = /obj/item/device/robotanalyzer/augment + augment_type = /obj/item/robotanalyzer/augment /obj/item/organ/internal/augment/tool/cyborg_analyzer/left parent_organ = BP_L_HAND diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm index 55f4be89383..b4a5b2f24ad 100644 --- a/code/modules/organs/subtypes/vaurca.dm +++ b/code/modules/organs/subtypes/vaurca.dm @@ -372,7 +372,7 @@ ..() var/obj/icon = src - if ((istype(attacking_item, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) + if ((istype(attacking_item, /obj/item/analyzer)) && get_dist(user, src) <= 1) user.visible_message(SPAN_WARNING("[user] has used [attacking_item] on [icon2html(icon, viewers(get_turf(user)))] [src].")) var/pressure = air_contents.return_pressure() @@ -536,7 +536,7 @@ var/pressure = air_contents.return_pressure() if(pressure > TANK_FRAGMENT_PRESSURE) - if(!istype(src.loc,/obj/item/device/transfer_valve)) + if(!istype(src.loc,/obj/item/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") diff --git a/code/modules/overmap/contacts/contact_sensors.dm b/code/modules/overmap/contacts/contact_sensors.dm index 707e0939480..daa0c08ba64 100644 --- a/code/modules/overmap/contacts/contact_sensors.dm +++ b/code/modules/overmap/contacts/contact_sensors.dm @@ -168,7 +168,7 @@ /obj/machinery/computer/ship/sensors/attackby(obj/item/attacking_item, mob/user) . = ..() - var/obj/item/device/multitool/P = attacking_item + var/obj/item/multitool/P = attacking_item if(!istype(P)) return var/obj/item/ship_tracker/tracker = P.get_buffer() diff --git a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm index 72d28c9cbd0..d6861d3ee54 100644 --- a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm +++ b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm @@ -57,7 +57,7 @@ if(!stored_item) to_chat(user,SPAN_NOTICE("There is nothing hidden in [src].")) else - if(istype(stored_item, /obj/item/device/paicard)) + if(istype(stored_item, /obj/item/paicard)) stored_item.forceMove(src.loc) to_chat(user,SPAN_NOTICE("You reveal \the [stored_item] from [src].")) else diff --git a/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm b/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm index 46d0a790faf..c7a53835bc1 100644 --- a/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm +++ b/code/modules/overmap/ship_weaponry/_ship_ammo_loader.dm @@ -67,7 +67,7 @@ return load_ammo(SA, HV) else to_chat(user, SPAN_WARNING("\The [CL] does not appear to be holding any compatible ammunition.")) - if(istype(attacking_item, /obj/item/device/multitool)) + if(istype(attacking_item, /obj/item/multitool)) to_chat(user, SPAN_NOTICE("You hook up the tester's wires to \the [src]: its identification tag is [weapon_id].")) var/new_id = input(user, "Change the identification tag?", "Identification Tag", weapon_id) if(length(new_id) && !use_check_and_message(user)) diff --git a/code/modules/overmap/ship_weaponry/_ship_gun.dm b/code/modules/overmap/ship_weaponry/_ship_gun.dm index 6673b74176a..910c54e6914 100644 --- a/code/modules/overmap/ship_weaponry/_ship_gun.dm +++ b/code/modules/overmap/ship_weaponry/_ship_gun.dm @@ -114,7 +114,7 @@ qdel(src) /obj/machinery/ship_weapon/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/multitool)) + if(istype(attacking_item, /obj/item/multitool)) to_chat(user, SPAN_NOTICE("You hook up the tester to \the [src]'s wires: its identification tag is [weapon_id]>.")) var/new_id = input(user, "Change the identification tag?", "Identification Tag", weapon_id) as text|null if(length(new_id) && !use_check_and_message(user)) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 91a31665609..f9d6c5ccab4 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -26,7 +26,7 @@ return TRUE -/obj/item/device/hand_labeler +/obj/item/hand_labeler name = "hand labeler" icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler0" @@ -37,10 +37,10 @@ var/mode = 0 //off or on. matter = list(DEFAULT_WALL_MATERIAL = 120, MATERIAL_GLASS = 80) -/obj/item/device/hand_labeler/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/hand_labeler/attack(mob/living/target_mob, mob/living/user, target_zone) return -/obj/item/device/hand_labeler/afterattack(atom/A, mob/user as mob, proximity) +/obj/item/hand_labeler/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if(!mode) //if it's off, give up. @@ -90,7 +90,7 @@ A.name = "[A.name] ([label])" -/obj/item/device/hand_labeler/attack_self(mob/user as mob) +/obj/item/hand_labeler/attack_self(mob/user as mob) mode = !mode icon_state = "labeler[mode]" item_state = icon_state diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 8758e076fc4..6bc54da7540 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -83,7 +83,7 @@ if(toner >= 5) var/mob/living/silicon/tempAI = usr - var/obj/item/device/camera/siliconcam/camera = tempAI.ai_camera + var/obj/item/camera/siliconcam/camera = tempAI.ai_camera if(!camera) return @@ -114,12 +114,12 @@ SStgui.update_uis(src) else to_chat(user, SPAN_NOTICE("There is already something in \the [src].")) - else if(istype(attacking_item, /obj/item/device/toner)) + else if(istype(attacking_item, /obj/item/toner)) if(toner <= 10) //allow replacing when low toner is affecting the print darkness to_chat(user, SPAN_NOTICE("You insert \the [attacking_item] into \the [src].")) flick("photocopier_toner", src) playsound(loc, SFX_SWITCH, 50, 1) - var/obj/item/device/toner/T = attacking_item + var/obj/item/toner/T = attacking_item toner = min(toner + T.toner_amount, max_toner) user.drop_from_inventory(attacking_item, get_turf(src)) qdel(attacking_item) @@ -278,9 +278,9 @@ p.pixel_x = rand(-9, 9) return p -/obj/item/device/toner +/obj/item/toner name = "toner cartridge" desc = "A high-definition toner for colour photocopying and printer machines. Good thing it's a business expense." - icon = 'icons/obj/item/device/toner.dmi' + icon = 'icons/obj/item/toner.dmi' icon_state = "tonercartridge" var/toner_amount = 30 diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index bdc25d3093a..5e9998213cd 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -9,7 +9,7 @@ /******* * film * *******/ -/obj/item/device/camera_film +/obj/item/camera_film name = "film cartridge" icon = 'icons/obj/bureaucracy.dmi' desc = "A camera film cartridge. Insert it into a camera to reload it." @@ -17,7 +17,7 @@ item_state = "electropack" w_class = WEIGHT_CLASS_TINY -/obj/item/device/camera_film/taj_film +/obj/item/camera_film/taj_film name = "film canister" icon = 'icons/obj/tajara_items.dmi' desc = "A rolle of 35mm film intended for cameras of Tajaran make." @@ -137,7 +137,7 @@ GLOBAL_VAR_INIT(photo_count, 0) /********* * camera * *********/ -/obj/item/device/camera +/obj/item/camera name = "camera" icon = 'icons/obj/bureaucracy.dmi' desc = "A polaroid camera." @@ -155,12 +155,12 @@ GLOBAL_VAR_INIT(photo_count, 0) var/icon_off = "camera_off" var/size = 3 -/obj/item/device/camera/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/camera/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(is_adjacent) . += SPAN_NOTICE("It has [pictures_left] photos left.") -/obj/item/device/camera/verb/change_size() +/obj/item/camera/verb/change_size() set name = "Set Photo Focus" set category = "Object" set src in usr @@ -170,10 +170,10 @@ GLOBAL_VAR_INIT(photo_count, 0) size = nsize to_chat(usr, SPAN_NOTICE("Camera will now take [size]x[size] photos.")) -/obj/item/device/camera/attack(mob/living/target_mob, mob/living/user, target_zone) +/obj/item/camera/attack(mob/living/target_mob, mob/living/user, target_zone) return -/obj/item/device/camera/attack_self(mob/user as mob) +/obj/item/camera/attack_self(mob/user as mob) on = !on if(on) src.icon_state = icon_on @@ -182,8 +182,8 @@ GLOBAL_VAR_INIT(photo_count, 0) to_chat(user, "You switch the camera [on ? "on" : "off"].") return -/obj/item/device/camera/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/camera_film)) +/obj/item/camera/attackby(obj/item/attacking_item, mob/user) + if(istype(attacking_item, /obj/item/camera_film)) if(pictures_left) to_chat(user, SPAN_NOTICE("[src] still has some film in it!")) return TRUE @@ -194,10 +194,10 @@ GLOBAL_VAR_INIT(photo_count, 0) return TRUE return ..() -/obj/item/device/camera/AltClick(var/mob/user) +/obj/item/camera/AltClick(var/mob/user) change_size() -/obj/item/device/camera/proc/get_mobs(turf/the_turf as turf) +/obj/item/camera/proc/get_mobs(turf/the_turf as turf) var/mob_detail for(var/mob/living/carbon/A in the_turf) if(A.invisibility) continue @@ -216,7 +216,7 @@ GLOBAL_VAR_INIT(photo_count, 0) mob_detail += "You can also see [A] in the photo[A.health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]." return mob_detail -/obj/item/device/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) +/obj/item/camera/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if(!on || !pictures_left || ismob(target.loc)) return captureimage(target, user, flag) @@ -230,10 +230,10 @@ GLOBAL_VAR_INIT(photo_count, 0) icon_state = icon_on on = 1 -/obj/item/device/camera/proc/do_photo_sound() +/obj/item/camera/proc/do_photo_sound() playsound(loc, SFX_PRINT, 75, 1, -3) -/obj/item/device/camera/detective +/obj/item/camera/detective name = "detectives camera" desc = "A one use - polaroid camera." pictures_left = 30 @@ -242,11 +242,11 @@ GLOBAL_VAR_INIT(photo_count, 0) /mob/living/proc/can_capture_turf(turf/T) return TRUE // DVIEW will do sanity checks, we've got no special checks. -/obj/item/device/camera/proc/captureimage(atom/target, mob/living/user, flag) +/obj/item/camera/proc/captureimage(atom/target, mob/living/user, flag) var/obj/item/photo/p = createpicture(get_turf(target), user, flag) printpicture(user, p) -/obj/item/device/camera/proc/createpicture(atom/target, mob/living/user, flag) +/obj/item/camera/proc/createpicture(atom/target, mob/living/user, flag) var/mobs = "" var/list/turfs = list() @@ -291,7 +291,7 @@ GLOBAL_VAR_INIT(photo_count, 0) return p -/obj/item/device/camera/proc/printpicture(mob/user, obj/item/photo/p) +/obj/item/camera/proc/printpicture(mob/user, obj/item/photo/p) p.forceMove(user.loc) if(!user.get_inactive_hand()) user.put_in_inactive_hand(p) @@ -314,7 +314,7 @@ GLOBAL_VAR_INIT(photo_count, 0) return p -/obj/item/device/camera/adhomai +/obj/item/camera/adhomai name = "adhomian camera" icon = 'icons/obj/tajara_items.dmi' desc = "A slightly antiquated camera with a large flash bulb. Still popular with Tajara all over Adhomai." @@ -325,6 +325,6 @@ GLOBAL_VAR_INIT(photo_count, 0) icon_on = "taj_camera_on" icon_off = "taj_camera_off" -/obj/item/device/camera/adhomai/do_photo_sound() +/obj/item/camera/adhomai/do_photo_sound() flick("taj_camera_flash", src) playsound(loc, 'sound/items/camerabulb.ogg', 75, 1, -3) diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index e330202b434..2c855eb29f3 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -1,27 +1,27 @@ /************** * AI-specific * **************/ -/obj/item/device/camera/siliconcam +/obj/item/camera/siliconcam var/in_camera_mode = 0 var/photos_taken = 0 var/list/obj/item/photo/aipictures = list() -/obj/item/device/camera/siliconcam/ai_camera //camera AI can take pictures with +/obj/item/camera/siliconcam/ai_camera //camera AI can take pictures with name = "AI photo camera" -/obj/item/device/camera/siliconcam/robot_camera //camera cyborgs can take pictures with +/obj/item/camera/siliconcam/robot_camera //camera cyborgs can take pictures with name = "Cyborg photo camera" -/obj/item/device/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used +/obj/item/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used name = "Drone photo camera" -/obj/item/device/camera/siliconcam/proc/injectaialbum(obj/item/photo/p, var/sufix = "") //stores image information to a list similar to that of the datacore +/obj/item/camera/siliconcam/proc/injectaialbum(obj/item/photo/p, var/sufix = "") //stores image information to a list similar to that of the datacore p.forceMove(src) photos_taken++ p.name = "Image [photos_taken][sufix]" aipictures += p -/obj/item/device/camera/siliconcam/proc/injectmasteralbum(obj/item/photo/p) //stores image information to a list similar to that of the datacore +/obj/item/camera/siliconcam/proc/injectmasteralbum(obj/item/photo/p) //stores image information to a list similar to that of the datacore var/mob/living/silicon/robot/C = usr if(C.connected_ai) C.connected_ai.ai_camera.injectaialbum(p.copy(1), " (synced from [C.name])") @@ -32,7 +32,7 @@ // Always save locally injectaialbum(p) -/obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam) +/obj/item/camera/siliconcam/proc/selectpicture(obj/item/camera/siliconcam/cam) if(!cam) cam = getsource() @@ -51,7 +51,7 @@ if(q.name == find) return q -/obj/item/device/camera/siliconcam/proc/viewpictures() +/obj/item/camera/siliconcam/proc/viewpictures() var/obj/item/photo/selection = selectpicture() if(!selection) @@ -60,7 +60,7 @@ selection.show(usr) to_chat(usr, selection.desc) -/obj/item/device/camera/siliconcam/proc/deletepicture(obj/item/device/camera/siliconcam/cam) +/obj/item/camera/siliconcam/proc/deletepicture(obj/item/camera/siliconcam/cam) var/selection = selectpicture(cam) if(!selection) @@ -74,28 +74,28 @@ var/mob/living/silicon/ai = src return ai.TurfAdjacent(T) -/obj/item/device/camera/siliconcam/proc/toggle_camera_mode() +/obj/item/camera/siliconcam/proc/toggle_camera_mode() if(in_camera_mode) camera_mode_off() else camera_mode_on() -/obj/item/device/camera/siliconcam/proc/camera_mode_off() +/obj/item/camera/siliconcam/proc/camera_mode_off() src.in_camera_mode = 0 to_chat(usr, "Camera Mode deactivated") -/obj/item/device/camera/siliconcam/proc/camera_mode_on() +/obj/item/camera/siliconcam/proc/camera_mode_on() src.in_camera_mode = 1 to_chat(usr, "Camera Mode activated") -/obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/photo/p) +/obj/item/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/photo/p) injectaialbum(p) to_chat(usr, "Image recorded") -/obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/photo/p) +/obj/item/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/photo/p) injectmasteralbum(p) -/obj/item/device/camera/siliconcam/ai_camera/verb/take_image() +/obj/item/camera/siliconcam/ai_camera/verb/take_image() set category = "AI Commands" set name = "Take Image" set desc = "Takes an image" @@ -103,7 +103,7 @@ toggle_camera_mode() -/obj/item/device/camera/siliconcam/ai_camera/verb/view_images() +/obj/item/camera/siliconcam/ai_camera/verb/view_images() set category = "AI Commands" set name = "View Images" set desc = "View images" @@ -111,7 +111,7 @@ viewpictures() -/obj/item/device/camera/siliconcam/ai_camera/verb/delete_images() +/obj/item/camera/siliconcam/ai_camera/verb/delete_images() set category = "AI Commands" set name = "Delete Image" set desc = "Delete image" @@ -119,7 +119,7 @@ deletepicture() -/obj/item/device/camera/siliconcam/robot_camera/verb/take_image() +/obj/item/camera/siliconcam/robot_camera/verb/take_image() set category ="Robot Commands" set name = "Take Image" set desc = "Takes an image" @@ -127,7 +127,7 @@ toggle_camera_mode() -/obj/item/device/camera/siliconcam/robot_camera/verb/view_images() +/obj/item/camera/siliconcam/robot_camera/verb/view_images() set category ="Robot Commands" set name = "View Images" set desc = "View images" @@ -135,7 +135,7 @@ viewpictures() -/obj/item/device/camera/siliconcam/robot_camera/verb/delete_images() +/obj/item/camera/siliconcam/robot_camera/verb/delete_images() set category = "Robot Commands" set name = "Delete Image" set desc = "Delete a local image" @@ -143,12 +143,12 @@ deletepicture(src) -/obj/item/device/camera/siliconcam/proc/getsource() +/obj/item/camera/siliconcam/proc/getsource() if(istype(src.loc, /mob/living/silicon/ai)) return src var/mob/living/silicon/robot/C = usr - var/obj/item/device/camera/siliconcam/Cinfo + var/obj/item/camera/siliconcam/Cinfo if(C.connected_ai) Cinfo = C.connected_ai.ai_camera else diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index a41b3e2f782..4083d140520 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -219,7 +219,7 @@ control_unit.reported_core_efficiency += (new_efficiency - efficiency) efficiency = new_efficiency -/obj/item/device/am_shielding_container +/obj/item/am_shielding_container name = "packaged antimatter reactor section" desc = "A section of antimatter reactor shielding. Do not eat." icon = 'icons/obj/machinery/antimatter.dmi' @@ -229,11 +229,11 @@ throw_speed = 1 throw_range = 2 -/obj/item/device/am_shielding_container/mechanics_hints(mob/user, distance, is_adjacent) +/obj/item/am_shielding_container/mechanics_hints(mob/user, distance, is_adjacent) . += ..() . += "To deploy, drop near an antimatter control unit or an existing deployed section and use your multitool on it." -/obj/item/device/am_shielding_container/attackby(obj/item/attacking_item, mob/user) +/obj/item/am_shielding_container/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_MULTITOOL && isturf(loc)) if(locate(/obj/machinery/am_shielding) in loc) to_chat(user, SPAN_WARNING("There is already an antimatter reactor section there.")) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 0c4bf1f1596..ba7b2b7863d 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -726,7 +726,7 @@ ABSTRACT_TYPE(/obj/machinery/power/apc) update_icon() // DEBUGGER: Repair emagged/infected/fucked up APCs. - else if (istype(attacking_item, /obj/item/device/debugger)) + else if (istype(attacking_item, /obj/item/debugger)) if(emagged || hacker || infected) to_chat(user, SPAN_WARNING("There is a software error with the device. Attempting to fix...")) if(attacking_item.use_tool(src, user, 50, volume = 50)) @@ -772,7 +772,7 @@ ABSTRACT_TYPE(/obj/machinery/power/apc) return attack_hand(user) if (opened == COVER_CLOSED && panel_open && \ attacking_item.tool_behaviour == TOOL_MULTITOOL || \ - attacking_item.tool_behaviour == TOOL_WIRECUTTER || istype(attacking_item, /obj/item/device/assembly/signaler)) + attacking_item.tool_behaviour == TOOL_WIRECUTTER || istype(attacking_item, /obj/item/assembly/signaler)) return attack_hand(user) user.visible_message(SPAN_DANGER("The [name] has been hit with the [attacking_item.name] by [user.name]!"), \ SPAN_DANGER("You hit the [name] with your [attacking_item.name]!"), \ diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 36172682755..07d87844f1d 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -132,14 +132,14 @@ S.reagents.clear_reagents() return - else if(istype(attacking_item, /obj/item/device/assembly_holder)) - var/obj/item/device/assembly_holder/assembly = attacking_item - if (istype(assembly.a_left, /obj/item/device/assembly/signaler) && istype(assembly.a_right, /obj/item/device/assembly/signaler)) + else if(istype(attacking_item, /obj/item/assembly_holder)) + var/obj/item/assembly_holder/assembly = attacking_item + if (istype(assembly.a_left, /obj/item/assembly/signaler) && istype(assembly.a_right, /obj/item/assembly/signaler)) //TODO: Look into this bad code user.drop_item() user.drop_from_inventory(src) - new /obj/item/device/radiojammer/improvised(assembly, src, user) + new /obj/item/radiojammer/improvised(assembly, src, user) else to_chat(user, SPAN_NOTICE("You'd need both devices to be signallers for this to work.")) return diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm index de2f990d1e6..9a58ba1426d 100644 --- a/code/modules/power/fusion/core/core_field.dm +++ b/code/modules/power/fusion/core/core_field.dm @@ -80,7 +80,7 @@ var/animating_ripple = FALSE - var/obj/item/device/radio/radio + var/obj/item/radio/radio var/safe_alert = "NOTICE: INDRA reactor stabilizing." var/safe_warned = FALSE var/public_alert = FALSE @@ -177,7 +177,7 @@ /obj/effect/fusion_em_field/Initialize() . = ..() addtimer(CALLBACK(src, PROC_REF(update_light_colors)), 10 SECONDS, TIMER_LOOP) - radio = new /obj/item/device/radio{channels=list("Engineering")}(src) + radio = new /obj/item/radio{channels=list("Engineering")}(src) /** * What are we doing every tick? A lot. diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm index 69f816a0442..4ee6dc181f6 100644 --- a/code/modules/power/lights/fixtures.dm +++ b/code/modules/power/lights/fixtures.dm @@ -326,8 +326,8 @@ /obj/machinery/light/attackby(obj/item/attacking_item, mob/user) //Light replacer code - if(istype(attacking_item, /obj/item/device/lightreplacer)) - var/obj/item/device/lightreplacer/LR = attacking_item + if(istype(attacking_item, /obj/item/lightreplacer)) + var/obj/item/lightreplacer/LR = attacking_item if(isliving(user)) var/mob/living/U = user LR.ReplaceLight(src, U) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index ad124642407..3a42c56118c 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -60,7 +60,7 @@ /// This value needs to be zero. It represents seconds since the last overheat event var/last_overheat = 0 /// Internal radio, used to alert engineers of turbine trip! - var/obj/item/device/radio/radio + var/obj/item/radio/radio component_types = list( /obj/item/stock_parts/manipulator = 6, diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index f4e0adc06e6..ebf48afa381 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -122,7 +122,7 @@ var/reliability = 100 /// Standard firing pin for most guns. - var/obj/item/device/firing_pin/pin = /obj/item/device/firing_pin + var/obj/item/firing_pin/pin = /obj/item/firing_pin var/cyborg_maptext_override var/displays_maptext = FALSE @@ -234,7 +234,7 @@ if (needspin) if(!pin) - pin = /obj/item/device/firing_pin + pin = /obj/item/firing_pin pin = new pin(src) else pin = null diff --git a/code/modules/projectiles/guns/energy/disruptor.dm b/code/modules/projectiles/guns/energy/disruptor.dm index cfe761c7b81..59d46e1a2b7 100644 --- a/code/modules/projectiles/guns/energy/disruptor.dm +++ b/code/modules/projectiles/guns/energy/disruptor.dm @@ -37,7 +37,7 @@ ) /obj/item/gun/energy/disruptorpistol/security - pin = /obj/item/device/firing_pin/wireless + pin = /obj/item/firing_pin/wireless /obj/item/gun/energy/disruptorpistol/miniature name = "miniature disruptor pistol" @@ -49,7 +49,7 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/gun/energy/disruptorpistol/miniature/security - pin = /obj/item/device/firing_pin/wireless + pin = /obj/item/firing_pin/wireless /obj/item/gun/energy/disruptorpistol/magnum name = "magnum disruptor pistol" @@ -59,4 +59,4 @@ force = 14 /obj/item/gun/energy/disruptorpistol/magnum/security - pin = /obj/item/device/firing_pin/wireless + pin = /obj/item/firing_pin/wireless diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 86616e083aa..b3a78ee530c 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -211,7 +211,7 @@ /obj/item/gun/energy/laser/shotgun/research name = "expedition shotgun" desc = "A NanoTrasen designed laser weapon, designed to split a single amplified beam four times. This one is marked for expeditionary use." - pin = /obj/item/device/firing_pin/away_site + pin = /obj/item/firing_pin/away_site ////////Laser Tag//////////////////// @@ -226,7 +226,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 2000) fire_sound = 'sound/weapons/laser1.ogg' projectile_type = /obj/projectile/beam/laser_tag - pin = /obj/item/device/firing_pin/tag/red + pin = /obj/item/firing_pin/tag/red can_turret = TRUE turret_is_lethal = FALSE turret_sprite_set = "red" @@ -245,7 +245,7 @@ projectile_type = text2path("/obj/projectile/beam/laser_tag/[set_color]") if(pin) QDEL_NULL(pin) - var/pin_path = text2path("/obj/item/device/firing_pin/tag/[set_color]") + var/pin_path = text2path("/obj/item/firing_pin/tag/[set_color]") pin = new pin_path(src) switch(set_color) if("red") @@ -262,7 +262,7 @@ icon_state = "bluetag" item_state = "bluetag" projectile_type = /obj/projectile/beam/laser_tag/blue - pin = /obj/item/device/firing_pin/tag/blue + pin = /obj/item/firing_pin/tag/blue turret_sprite_set = "blue" /obj/item/gun/energy/lasertag/red diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm index 432158b91fd..b268b5a35f2 100644 --- a/code/modules/projectiles/guns/energy/modular.dm +++ b/code/modules/projectiles/guns/energy/modular.dm @@ -217,11 +217,11 @@ pin = null switch(origin_chassis) if(CHASSIS_SMALL) - new /obj/item/device/laser_assembly(A) + new /obj/item/laser_assembly(A) if(CHASSIS_MEDIUM) - new /obj/item/device/laser_assembly/medium(A) + new /obj/item/laser_assembly/medium(A) if(CHASSIS_LARGE) - new /obj/item/device/laser_assembly/large(A) + new /obj/item/laser_assembly/large(A) qdel(src) /obj/item/gun/energy/laser/prototype/small_fail(var/mob/user) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index d2f75fc4247..1e767485412 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -337,7 +337,7 @@ item_state = "psipistolstun100" fire_sound = 'sound/weapons/Taser.ogg' slot_flags = SLOT_BELT|SLOT_HOLSTER - pin = /obj/item/device/firing_pin/psionic + pin = /obj/item/firing_pin/psionic max_shots = 10 fire_delay = 4 can_turret = FALSE @@ -354,4 +354,4 @@ ) /obj/item/gun/energy/fedpistol/nopsi - pin = /obj/item/device/firing_pin + pin = /obj/item/firing_pin diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index af986c15d82..29a26dda8f0 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -188,7 +188,7 @@ else to_chat(user, SPAN_NOTICE("You need at least five metal sheets to complete this task.")) return - else if(istype(attacking_item,/obj/item/device/transfer_valve)) + else if(istype(attacking_item,/obj/item/transfer_valve)) if(buildstate == 4) qdel(attacking_item) to_chat(user, SPAN_NOTICE("You install the transfer valve and connect it to the piping.")) diff --git a/code/modules/projectiles/modular/laser_base.dm b/code/modules/projectiles/modular/laser_base.dm index b45dae36a7e..5ffde6f52cb 100644 --- a/code/modules/projectiles/modular/laser_base.dm +++ b/code/modules/projectiles/modular/laser_base.dm @@ -134,7 +134,7 @@ /obj/item/laser_components/modulator/degrade() return -/obj/item/device/laser_assembly +/obj/item/laser_assembly name = "laser assembly (small)" desc = "A case for shoving things into. Hopefully they work." w_class = WEIGHT_CLASS_SMALL @@ -153,11 +153,11 @@ var/ready_to_craft = FALSE // Use by weapons analyzer. var/datum/weakref/analyzer -/obj/item/device/laser_assembly/Initialize() +/obj/item/laser_assembly/Initialize() . = ..() update_icon() -/obj/item/device/laser_assembly/attackby(obj/item/attacking_item, mob/user) +/obj/item/laser_assembly/attackby(obj/item/attacking_item, mob/user) var/obj/item/laser_components/A = attacking_item var/success = FALSE if(!istype(A)) @@ -203,7 +203,7 @@ return success -/obj/item/device/laser_assembly/update_icon() +/obj/item/laser_assembly/update_icon() ..() underlays.Cut() icon_state = "[base_icon_state]_[stage]" @@ -213,11 +213,11 @@ underlays += mod.gun_overlay -/obj/item/device/laser_assembly/proc/check_completion() +/obj/item/laser_assembly/proc/check_completion() if(capacitor && focusing_lens && modulator) return finish() -/obj/item/device/laser_assembly/proc/finish() +/obj/item/laser_assembly/proc/finish() var/obj/machinery/r_n_d/weapons_analyzer/an = analyzer.resolve() if(!an) @@ -250,7 +250,7 @@ qdel(src) return TRUE -/obj/item/device/laser_assembly/get_print_info() +/obj/item/laser_assembly/get_print_info() . = "" for(var/i in list(capacitor, focusing_lens, modulator) + gun_mods) var/obj/item/laser_components/l_component = i diff --git a/code/modules/projectiles/modular/laser_components.dm b/code/modules/projectiles/modular/laser_components.dm index f4f3ee8380b..5d7f13cc2e9 100644 --- a/code/modules/projectiles/modular/laser_components.dm +++ b/code/modules/projectiles/modular/laser_components.dm @@ -1,20 +1,20 @@ //Assemblies -/obj/item/device/laser_assembly/medium +/obj/item/laser_assembly/medium name = "laser assembly (medium)" base_icon_state = "medium" w_class = WEIGHT_CLASS_NORMAL size = CHASSIS_MEDIUM modifier_cap = 4 -/obj/item/device/laser_assembly/large +/obj/item/laser_assembly/large name = "laser assembly (large)" base_icon_state = "large" w_class = WEIGHT_CLASS_BULKY size = CHASSIS_LARGE modifier_cap = 5 -/obj/item/device/laser_assembly/admin +/obj/item/laser_assembly/admin name = "laser assembly (obscene)" base_icon_state = "large" w_class = WEIGHT_CLASS_BULKY diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index 8cf46ceefc5..8796961d0bc 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -5,7 +5,7 @@ Alright boys, Firing pins. hopefully with minimal shitcode. Firing pins as a rule can't be removed without replacing them, blame a really shitty mechanism for it by NT or something idk, this is to stop people from just taking pins from like a capgun or something. */ -/obj/item/device/firing_pin +/obj/item/firing_pin name = "electronic firing pin" desc = "A small authentication device, to be inserted into a firearm receiver to allow operation. NT safety regulations require all new designs to incorporate one." icon = 'icons/obj/firingpins.dmi' @@ -25,25 +25,25 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' -/obj/item/device/firing_pin/Initialize(mapload) +/obj/item/firing_pin/Initialize(mapload) .=..() if(istype(loc, /obj/item/gun)) gun = loc update_icon() -/obj/item/device/firing_pin/pickup(mob/user) +/obj/item/firing_pin/pickup(mob/user) ..() update_icon() -/obj/item/device/firing_pin/dropped(mob/user) +/obj/item/firing_pin/dropped(mob/user) ..() update_icon() -/obj/item/device/firing_pin/attack_hand() +/obj/item/firing_pin/attack_hand() ..() update_icon() -/obj/item/device/firing_pin/update_icon() +/obj/item/firing_pin/update_icon() var/matrix/tf = matrix() var/obj/item/storage/S = loc if(istype(S, /obj/item/storage) && !S.storage_slots) @@ -51,10 +51,10 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh tf.Translate(-1, 0) //Could do this with pixel_x but let's just update the appearance once. transform = tf -/obj/item/device/firing_pin/proc/examine_info() // Part of what allows people to see what firing mode their wireless control pin is in. Returns nothing here if there's no wireless-control firing pin. +/obj/item/firing_pin/proc/examine_info() // Part of what allows people to see what firing mode their wireless control pin is in. Returns nothing here if there's no wireless-control firing pin. return -/obj/item/device/firing_pin/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/firing_pin/afterattack(atom/target, mob/user, proximity_flag) if(proximity_flag) if(istype(target, /obj/item/gun)) var/obj/item/gun/G = target @@ -73,27 +73,27 @@ Firing pins as a rule can't be removed without replacing them, blame a really sh else to_chat(user, SPAN_NOTICE("This firearm already has a firing pin installed.")) -/obj/item/device/firing_pin/emag_act() +/obj/item/firing_pin/emag_act() if(!emagged) emagged = TRUE to_chat(get_holding_mob(src), SPAN_NOTICE("You override the authentication mechanism.")) -/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G) +/obj/item/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G) gun = G user.drop_from_inventory(src,gun) gun.pin = src return -/obj/item/device/firing_pin/proc/gun_remove(mob/living/user) +/obj/item/firing_pin/proc/gun_remove(mob/living/user) gun.pin = null gun = null qdel(src) return -/obj/item/device/firing_pin/proc/pin_auth(mob/living/user) +/obj/item/firing_pin/proc/pin_auth(mob/living/user) return 1 -/obj/item/device/firing_pin/proc/auth_fail(mob/living/carbon/human/user) +/obj/item/firing_pin/proc/auth_fail(mob/living/carbon/human/user) to_chat(user, fail_message) if(selfdestruct)//sound stolen from the lawgiver. todo, remove this from the lawgiver. there can only be one. user.show_message(SPAN_DANGER("SELF-DESTRUCTING...
"), 1) @@ -110,7 +110,7 @@ Pins Below. */ // Test pin, works only near firing ranges. -/obj/item/device/firing_pin/test_range +/obj/item/firing_pin/test_range name = "test-range firing pin" desc = "This safety firing pin allows weapons to be fired within proximity to a firing range." fail_message = SPAN_WARNING("TEST RANGE CHECK FAILED.") @@ -118,7 +118,7 @@ Pins Below. durable = TRUE origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2) -/obj/item/device/firing_pin/test_range/pin_auth(mob/living/user) +/obj/item/firing_pin/test_range/pin_auth(mob/living/user) var/area/A = get_area(src) if (A && (A.area_flags & AREA_FLAG_FIRING_RANGE)) return 1 @@ -126,31 +126,31 @@ Pins Below. return 0 // Psionics pin, checks for psionics (psi aug not included) -/obj/item/device/firing_pin/psionic +/obj/item/firing_pin/psionic name = "psionics firing pin" desc = "This is a psionics-locked firing pin which only authorizes users who are capable of psionics." fail_message = SPAN_WARNING("PSIONICS CHECK FAILED.") -/obj/item/device/firing_pin/psionic/pin_auth(mob/living/user) +/obj/item/firing_pin/psionic/pin_auth(mob/living/user) if(user.has_psionics()) return 1 else return 0 // Implant pin, checks for implant -/obj/item/device/firing_pin/implant +/obj/item/firing_pin/implant name = "implant-keyed firing pin" desc = "This is a implant-locked firing pin which only authorizes users who are implanted with a certain device." fail_message = SPAN_WARNING("IMPLANT CHECK FAILED.") var/req_implant -/obj/item/device/firing_pin/implant/pin_auth(mob/living/user) +/obj/item/firing_pin/implant/pin_auth(mob/living/user) if (locate(req_implant) in user) return 1 else return 0 -/obj/item/device/firing_pin/implant/loyalty +/obj/item/firing_pin/implant/loyalty name = "mind shield firing pin" desc = "This implant-locked firing pin authorizes the weapon for only mind shielded users." icon_state = "firing_pin_loyalty" @@ -158,27 +158,27 @@ Pins Below. // Honk pin, clown joke item. // Can replace other pins. Replace a pin in cap's laser for extra fun! This is generally adminbus only unless someone thinks of a use for it. -/obj/item/device/firing_pin/clown +/obj/item/firing_pin/clown name = "hilarious firing pin" desc = "Advanced clowntech that can convert any firearm into a far more useful object." color = "#FFFF00" fail_message = SPAN_WARNING("HONK!") force_replace = 1 -/obj/item/device/firing_pin/clown/pin_auth(mob/living/user) +/obj/item/firing_pin/clown/pin_auth(mob/living/user) playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) return 0 // DNA-keyed pin. // When you want to keep your toys for youself. -/obj/item/device/firing_pin/dna +/obj/item/firing_pin/dna name = "DNA-keyed firing pin" desc = "This is a DNA-locked firing pin which only authorizes one user. Attempt to fire once to DNA-link." icon_state = "firing_pin_dna" fail_message = SPAN_WARNING("DNA CHECK FAILED.") var/unique_enzymes = null -/obj/item/device/firing_pin/dna/afterattack(atom/target, mob/user, proximity_flag) +/obj/item/firing_pin/dna/afterattack(atom/target, mob/user, proximity_flag) ..() if(proximity_flag && iscarbon(target)) var/mob/living/carbon/M = target @@ -186,14 +186,14 @@ Pins Below. unique_enzymes = M.dna.unique_enzymes to_chat(user, SPAN_NOTICE("DNA-LOCK SET.")) -/obj/item/device/firing_pin/dna/pin_auth(mob/living/carbon/user) +/obj/item/firing_pin/dna/pin_auth(mob/living/carbon/user) if(istype(user) && user.dna && user.dna.unique_enzymes) if(user.dna.unique_enzymes == unique_enzymes) return 1 return 0 -/obj/item/device/firing_pin/dna/auth_fail(mob/living/carbon/user) +/obj/item/firing_pin/dna/auth_fail(mob/living/carbon/user) if(!unique_enzymes) if(istype(user) && user.dna && user.dna.unique_enzymes) unique_enzymes = user.dna.unique_enzymes @@ -201,19 +201,19 @@ Pins Below. else ..() -/obj/item/device/firing_pin/dna/dredd +/obj/item/firing_pin/dna/dredd desc = "This is a DNA-locked firing pin which only authorizes one user. Attempt to fire once to DNA-link. It has a small explosive charge on it." selfdestruct = 1 // Laser tag pins -/obj/item/device/firing_pin/tag +/obj/item/firing_pin/tag name = "laser tag firing pin" desc = "A recreational firing pin, used in laser tag units to ensure users have their vests on." fail_message = SPAN_WARNING("SUIT CHECK FAILED.") var/tag_color = "" -/obj/item/device/firing_pin/tag/pin_auth(mob/living/user) +/obj/item/firing_pin/tag/pin_auth(mob/living/user) if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/clothing/suit/armor/riot/laser_tag/LT = H.wear_suit @@ -222,52 +222,52 @@ Pins Below. to_chat(user, SPAN_WARNING("You need to be wearing [tag_color] laser tag armor!")) return FALSE -/obj/item/device/firing_pin/tag/red +/obj/item/firing_pin/tag/red name = "red laser tag firing pin" icon_state = "firing_pin_red" tag_color = "red" -/obj/item/device/firing_pin/tag/blue +/obj/item/firing_pin/tag/blue name = "blue laser tag firing pin" icon_state = "firing_pin_blue" tag_color = "blue" -/obj/item/device/firing_pin/Destroy() +/obj/item/firing_pin/Destroy() if(gun) gun.pin = null gun = null return ..() //this firing pin checks for access -/obj/item/device/firing_pin/access +/obj/item/firing_pin/access name = "access-keyed firing pin" desc = "This access locked firing pin allows weapons to be fired only when the user has the required access." fail_message = SPAN_WARNING("ACCESS CHECK FAILED.") req_access = list(ACCESS_WEAPONS) -/obj/item/device/firing_pin/access/pin_auth(mob/living/user) +/obj/item/firing_pin/access/pin_auth(mob/living/user) return !allowed(user) -/obj/item/device/firing_pin/away_site +/obj/item/firing_pin/away_site name = "away site firing pin" desc = "This access locked firing pin allows weapons to be fired only when the user is not on-ship." fail_message = SPAN_WARNING("USER ON SHIP LEVEL.") -/obj/item/device/firing_pin/away_site/pin_auth(mob/living/user) +/obj/item/firing_pin/away_site/pin_auth(mob/living/user) var/turf/T = get_turf(src) return !is_station_level(T.z) ///A list of all initialized wireless firing pins. Used in the firearm tracking program in guntracker.dm -GLOBAL_LIST_EMPTY_TYPED(wireless_firing_pins, /obj/item/device/firing_pin/wireless) +GLOBAL_LIST_EMPTY_TYPED(wireless_firing_pins, /obj/item/firing_pin/wireless) -/obj/item/device/firing_pin/wireless +/obj/item/firing_pin/wireless name = "wireless-control firing pin" desc = "This firing pin is wirelessly controlled. On automatic mode it allow allows weapons to be fired on stun unless the alert level is elevated. Otherwise, it can be controlled from a firearm control console." fail_message = SPAN_WARNING("The wireless-control firing pin clicks!") var/registered_user = null var/lock_status = WIRELESS_PIN_AUTOMATIC -/obj/item/device/firing_pin/wireless/examine_info(mob/user) +/obj/item/firing_pin/wireless/examine_info(mob/user) var/wireless_description switch(lock_status) if(WIRELESS_PIN_AUTOMATIC) @@ -280,12 +280,12 @@ GLOBAL_LIST_EMPTY_TYPED(wireless_firing_pins, /obj/item/device/firing_pin/wirele wireless_description = "is in unrestricted mode" to_chat(user, SPAN_NOTICE("The wireless-control firing pin [wireless_description].")) -/obj/item/device/firing_pin/wireless/Initialize() //Adds wireless pins to the list of initialized wireless firing pins. +/obj/item/firing_pin/wireless/Initialize() //Adds wireless pins to the list of initialized wireless firing pins. . = ..() GLOB.wireless_firing_pins += src -/obj/item/device/firing_pin/wireless/Destroy() //Removes the wireless pins from the list of initialized wireless firing pins. +/obj/item/firing_pin/wireless/Destroy() //Removes the wireless pins from the list of initialized wireless firing pins. GLOB.wireless_firing_pins -= src return ..() @@ -297,7 +297,7 @@ GLOBAL_LIST_EMPTY_TYPED(wireless_firing_pins, /obj/item/device/firing_pin/wirele Stun-Only: The weapon will only fire on stun regardless of the current security level. Lethal: The weapon will fire on all modes regardless of the current security level. */ -/obj/item/device/firing_pin/wireless/pin_auth(mob/living/user) +/obj/item/firing_pin/wireless/pin_auth(mob/living/user) if(!registered_user) fail_message = SPAN_WARNING("Unable to fire: no registered user detected.") return FALSE @@ -341,7 +341,7 @@ GLOBAL_LIST_EMPTY_TYPED(wireless_firing_pins, /obj/item/device/firing_pin/wirele return FALSE -/obj/item/device/firing_pin/wireless/proc/set_mode(var/new_mode) // Changes the current lock_status of the weapon, and sends a message and sfx to whoever is holding it. +/obj/item/firing_pin/wireless/proc/set_mode(var/new_mode) // Changes the current lock_status of the weapon, and sends a message and sfx to whoever is holding it. var/mob/user = get_holding_mob(src) if(new_mode == lock_status) @@ -369,7 +369,7 @@ GLOBAL_LIST_EMPTY_TYPED(wireless_firing_pins, /obj/item/device/firing_pin/wirele return -/obj/item/device/firing_pin/wireless/attackby(obj/item/attacking_item, mob/user) //Lets people register their IDs to the pin. Using it once registers you, using it again clears you. +/obj/item/firing_pin/wireless/attackby(obj/item/attacking_item, mob/user) //Lets people register their IDs to the pin. Using it once registers you, using it again clears you. if(istype(attacking_item, /obj/item/card/id)) var/obj/item/card/id/idcard = attacking_item if(idcard.registered_name == registered_user) diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 0f8085f4b64..8dde5358ce9 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -53,7 +53,7 @@ new_mob.set_invisibility(0) new_mob.job = "Cyborg" var/mob/living/silicon/robot/Robot = new_mob - Robot.mmi = new /obj/item/device/mmi(new_mob) + Robot.mmi = new /obj/item/mmi(new_mob) Robot.mmi.transfer_identity(M) //Does not transfer key/client. if("slime") new_mob = new /mob/living/carbon/slime(M.loc) diff --git a/code/modules/psionics/events/mini_spasm.dm b/code/modules/psionics/events/mini_spasm.dm index b9030f2af71..b1f53fbecab 100644 --- a/code/modules/psionics/events/mini_spasm.dm +++ b/code/modules/psionics/events/mini_spasm.dm @@ -24,17 +24,17 @@ ..() var/list/victims = list() - for(var/obj/item/device/radio/radio in GLOB.listening_objects) + for(var/obj/item/radio/radio in GLOB.listening_objects) if(radio.is_on()) for(var/mob/living/victim in range(radio.canhear_range, radio.loc)) if(isnull(victims[victim]) && victim.stat == CONSCIOUS && !isdeaf(victim)) victims[victim] = radio for(var/thing in victims) var/mob/living/victim = thing - var/obj/item/device/radio/source = victims[victim] + var/obj/item/radio/source = victims[victim] do_spasm(victim, source) -/datum/event/minispasm/proc/do_spasm(var/mob/living/victim, var/obj/item/device/radio/source) +/datum/event/minispasm/proc/do_spasm(var/mob/living/victim, var/obj/item/radio/source) set waitfor = 0 playsound(source, 'sound/effects/narsie.ogg', 75) //LOUD AS FUCK BOY diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f1463402c86..bae511a6bb4 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1460,7 +1460,7 @@ /datum/chemical_reaction/slime/glow/on_reaction(var/datum/reagents/holder, var/created_volume) ..() - new /obj/item/device/flashlight/slime(get_turf(holder.my_atom)) + new /obj/item/flashlight/slime(get_turf(holder.my_atom)) //Purple /datum/chemical_reaction/slime/psteroid diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 61564e4b43d..0bac7760aee 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -77,7 +77,7 @@ if(istype(attacking_item,/obj/item/storage/part_replacer)) if(!reagents || !reagents.total_volume) return ..() - if(attacking_item.tool_behaviour == TOOL_PEN || istype(attacking_item, /obj/item/device/flashlight/pen)) + if(attacking_item.tool_behaviour == TOOL_PEN || istype(attacking_item, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe( tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN ) if(length(tmp_label) > 15) to_chat(user, SPAN_NOTICE("The label can be at most 15 characters long.")) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 776c7a37d46..66a8a2b3c22 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -129,7 +129,7 @@ amount_per_transfer_from_this = 30 var/defuse = 0 var/armed = 0 - var/obj/item/device/assembly_holder/rig = null + var/obj/item/assembly_holder/rig = null reagents_to_add = list(/singleton/reagent/fuel = 1000) /obj/structure/reagent_dispensers/fueltank/feedback_hints(mob/user, distance, is_adjacent) @@ -162,7 +162,7 @@ user.put_in_hands(rig) rig = null overlays = new/list() - if (istype(attacking_item,/obj/item/device/assembly_holder)) + if (istype(attacking_item,/obj/item/assembly_holder)) if (rig) to_chat(user, SPAN_WARNING("There is another device in the way.")) return ..() @@ -171,8 +171,8 @@ user.visible_message(SPAN_NOTICE("[user] rigs [attacking_item] to \the [src]."), SPAN_NOTICE("You rig [attacking_item] to \the [src]")) - var/obj/item/device/assembly_holder/H = attacking_item - if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter)) + var/obj/item/assembly_holder/H = attacking_item + if (istype(H.a_left,/obj/item/assembly/igniter) || istype(H.a_right,/obj/item/assembly/igniter)) message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.") diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 32ee62d3289..b00028130e5 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -134,8 +134,8 @@ /obj/machinery/disposal/proc/contents_count() var/things = 0 for(var/thing in contents) - if(istype(thing, /obj/item/device/assembly/signaler)) - var/obj/item/device/assembly/signaler/S = thing + if(istype(thing, /obj/item/assembly/signaler)) + var/obj/item/assembly/signaler/S = thing if(S.connected == wires) continue things++ @@ -216,9 +216,9 @@ user.visible_message("[user] pours [attacking_item] out into [src].", SPAN_NOTICE("You pour [attacking_item] out into [src].")) return TRUE - else if (istype (attacking_item, /obj/item/device/lightreplacer)) + else if (istype (attacking_item, /obj/item/lightreplacer)) var/count = 0 - var/obj/item/device/lightreplacer/R = attacking_item + var/obj/item/lightreplacer/R = attacking_item if (R.store_broken) for(var/obj/item/light/L in R.contents) count++ @@ -701,8 +701,8 @@ // now everything inside the disposal gets put into the holder // note AM since can contain mobs or objs for(var/atom/movable/AM in D) - if(istype(AM, /obj/item/device/assembly/signaler)) - var/obj/item/device/assembly/signaler/S = AM + if(istype(AM, /obj/item/assembly/signaler)) + var/obj/item/assembly/signaler/S = AM if(S.connected == D.wires) continue AM.forceMove(src) @@ -1326,8 +1326,8 @@ if(..()) return - if(istype(attacking_item, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = attacking_item + if(istype(attacking_item, /obj/item/destTagger)) + var/obj/item/destTagger/O = attacking_item if(O.currTag)// Tag set sort_tag = O.currTag @@ -1397,8 +1397,8 @@ if(..()) return - if(istype(attacking_item, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = attacking_item + if(istype(attacking_item, /obj/item/destTagger)) + var/obj/item/destTagger/O = attacking_item if(O.currTag)// Tag set sortType = O.currTag diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 4f82a93b93e..6248f1b0dd0 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -38,8 +38,8 @@ qdel(src) /obj/structure/bigDelivery/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = attacking_item + if(istype(attacking_item, /obj/item/destTagger)) + var/obj/item/destTagger/O = attacking_item if(O.currTag) if(src.sortTag != O.currTag) to_chat(user, SPAN_NOTICE("You have labeled the destination as [O.currTag].")) @@ -153,8 +153,8 @@ return /obj/item/smallDelivery/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/destTagger)) - var/obj/item/device/destTagger/O = attacking_item + if(istype(attacking_item, /obj/item/destTagger)) + var/obj/item/destTagger/O = attacking_item if(O.currTag) if(src.sortTag != O.currTag) to_chat(user, SPAN_NOTICE("You have labeled the destination as [O.currTag].")) @@ -247,10 +247,10 @@ AM.forceMove(T) return ..() -/obj/item/device/destTagger +/obj/item/destTagger name = "destination tagger" desc = "Used to set the destination of properly wrapped packages." - icon = 'icons/obj/item/device/dest_tagger.dmi' + icon = 'icons/obj/item/dest_tagger.dmi' icon_state = "dest_tagger" var/currTag = 0 matter = list(DEFAULT_WALL_MATERIAL = 250, MATERIAL_GLASS = 140) @@ -258,7 +258,7 @@ obj_flags = OBJ_FLAG_CONDUCTABLE slot_flags = SLOT_BELT -/obj/item/device/destTagger/proc/openwindow(mob/user) +/obj/item/destTagger/proc/openwindow(mob/user) var/dat = "

TagMaster 2.3

" var/ui_ref = REF(src) @@ -274,11 +274,11 @@ user << browse(HTML_SKELETON(dat), "window=destTagScreen;size=450x375") onclose(user, "destTagScreen") -/obj/item/device/destTagger/attack_self(mob/user) +/obj/item/destTagger/attack_self(mob/user) openwindow(user) return -/obj/item/device/destTagger/Topic(href, href_list) +/obj/item/destTagger/Topic(href, href_list) src.add_fingerprint(usr) if(href_list["nextTag"] && (html_decode(href_list["nextTag"]) in SSdisposals.tagger_locations)) diff --git a/code/modules/research/designs/mechfab/robot/robot.dm b/code/modules/research/designs/mechfab/robot/robot.dm index e44f5de5d93..5701cff3ffc 100644 --- a/code/modules/research/designs/mechfab/robot/robot.dm +++ b/code/modules/research/designs/mechfab/robot/robot.dm @@ -62,7 +62,7 @@ name = "Synthetic Flash" req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2) materials = list(DEFAULT_WALL_MATERIAL = 750, MATERIAL_GLASS = 750) - build_path = /obj/item/device/flash/synthetic + build_path = /obj/item/flash/synthetic /datum/design/item/mechfab/robot/component/binary_communication_device name = "Binary Communication Device" diff --git a/code/modules/research/designs/protolathe/integrated_electronics_designs.dm b/code/modules/research/designs/protolathe/integrated_electronics_designs.dm index 6f5084f377d..4d2f356ae07 100644 --- a/code/modules/research/designs/protolathe/integrated_electronics_designs.dm +++ b/code/modules/research/designs/protolathe/integrated_electronics_designs.dm @@ -4,40 +4,40 @@ /datum/design/item/integrated_electronics/wirer req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500) - build_path = /obj/item/device/integrated_electronics/wirer + build_path = /obj/item/integrated_electronics/wirer /datum/design/item/integrated_electronics/debugger req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500) - build_path = /obj/item/device/integrated_electronics/debugger + build_path = /obj/item/integrated_electronics/debugger /datum/design/item/integrated_electronics/custom_circuit_assembly name = "Small Custom Assembly" desc = "A customizable assembly for simple, small devices." req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_POWER = 2) materials = list(DEFAULT_WALL_MATERIAL = 10000) - build_path = /obj/item/device/electronic_assembly + build_path = /obj/item/electronic_assembly /datum/design/item/integrated_electronics/custom_circuit_assembly/medium name = "Medium Custom Assembly" desc = "A customizable assembly suited for more ambitious mechanisms." req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_POWER = 3) materials = list(DEFAULT_WALL_MATERIAL = 20000) - build_path = /obj/item/device/electronic_assembly/medium + build_path = /obj/item/electronic_assembly/medium /datum/design/item/integrated_electronics/custom_circuit_assembly/drone name = "Drone Custom Assembly" desc = "A customizable assembly optimized for autonomous devices." req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4, TECH_POWER = 4) materials = list(DEFAULT_WALL_MATERIAL = 30000) - build_path = /obj/item/device/electronic_assembly/drone + build_path = /obj/item/electronic_assembly/drone /datum/design/item/integrated_electronics/custom_circuit_assembly/large name = "Large Custom Assembly" desc = "A customizable assembly for large machines." req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_POWER = 4) materials = list(DEFAULT_WALL_MATERIAL = 40000) - build_path = /obj/item/device/electronic_assembly/large + build_path = /obj/item/electronic_assembly/large /datum/design/item/integrated_electronics/custom_circuit_assembly/implant name = "Implant Custom Assembly" @@ -51,14 +51,14 @@ desc = "An customizable assembly designed to interface with other devices." req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) materials = list(DEFAULT_WALL_MATERIAL = 5000) - build_path = /obj/item/device/assembly/electronic_assembly + build_path = /obj/item/assembly/electronic_assembly /datum/design/item/integrated_electronics/custom_circuit_printer name = "Portable Integrated Circuit Printer" desc = "A portable(ish) printer for modular machines." req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 4, TECH_DATA = 5) materials = list(DEFAULT_WALL_MATERIAL = 10000) - build_path = /obj/item/device/integrated_circuit_printer + build_path = /obj/item/integrated_circuit_printer /datum/design/item/integrated_electronics/custom_circuit_printer_upgrade name = "Integrated Circuit Printer Upgrade - Advanced Designs" diff --git a/code/modules/research/designs/protolathe/medical_designs.dm b/code/modules/research/designs/protolathe/medical_designs.dm index cc6879225ab..bcaf88fa145 100644 --- a/code/modules/research/designs/protolathe/medical_designs.dm +++ b/code/modules/research/designs/protolathe/medical_designs.dm @@ -7,38 +7,38 @@ desc = "A hand-held body scanner able to distinguish vital signs of the subject." req_tech = list(TECH_MAGNET = 2, TECH_BIO = 3) materials = list(DEFAULT_WALL_MATERIAL = 200) - build_path = /obj/item/device/healthanalyzer + build_path = /obj/item/healthanalyzer /datum/design/item/medical/robot_scanner name = "Robot Analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." req_tech = list(TECH_MAGNET = 3, TECH_BIO = 2, TECH_ENGINEERING = 3) materials = list(DEFAULT_WALL_MATERIAL = 500, MATERIAL_GLASS = 200) - build_path = /obj/item/device/robotanalyzer + build_path = /obj/item/robotanalyzer /datum/design/item/medical/mass_spectrometer name = "Mass Spectrometer" desc = "A device for analyzing chemicals in blood." req_tech = list(TECH_BIO = 2, TECH_MAGNET = 2) - build_path = /obj/item/device/mass_spectrometer + build_path = /obj/item/mass_spectrometer /datum/design/item/medical/adv_mass_spectrometer name = "Advanced Mass Spectrometer" desc = "A device for analyzing chemicals in blood and their quantities." req_tech = list(TECH_BIO = 2, TECH_MAGNET = 4) - build_path = /obj/item/device/mass_spectrometer/adv + build_path = /obj/item/mass_spectrometer/adv /datum/design/item/medical/reagent_scanner name = "Reagent Scanner" desc = "A device for identifying chemicals." req_tech = list(TECH_BIO = 2, TECH_MAGNET = 2) - build_path = /obj/item/device/reagent_scanner + build_path = /obj/item/reagent_scanner /datum/design/item/medical/adv_reagent_scanner name = "Advanced Reagent Scanner" desc = "A device for identifying chemicals and their proportions." req_tech = list(TECH_BIO = 2, TECH_MAGNET = 4) - build_path = /obj/item/device/reagent_scanner/adv + build_path = /obj/item/reagent_scanner/adv /datum/design/item/medical/nanopaste name = "Nanopaste" diff --git a/code/modules/research/designs/protolathe/mining_designs.dm b/code/modules/research/designs/protolathe/mining_designs.dm index 8fbc175efe0..f049ba336eb 100644 --- a/code/modules/research/designs/protolathe/mining_designs.dm +++ b/code/modules/research/designs/protolathe/mining_designs.dm @@ -36,7 +36,7 @@ /datum/design/item/mining/kinetic_analyzer req_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) materials = list(DEFAULT_WALL_MATERIAL = 4000) - build_path = /obj/item/device/kinetic_analyzer + build_path = /obj/item/kinetic_analyzer /datum/design/item/mining/pick_set req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2) diff --git a/code/modules/research/designs/protolathe/modular_gun_designs.dm b/code/modules/research/designs/protolathe/modular_gun_designs.dm index f3970381391..1bc78b2c077 100644 --- a/code/modules/research/designs/protolathe/modular_gun_designs.dm +++ b/code/modules/research/designs/protolathe/modular_gun_designs.dm @@ -4,25 +4,25 @@ /datum/design/item/modular_weapon/firing_pin req_tech = list(TECH_MATERIAL = 1) materials = list(DEFAULT_WALL_MATERIAL = 500) - build_path = /obj/item/device/firing_pin/test_range + build_path = /obj/item/firing_pin/test_range /datum/design/item/modular_weapon/firing_pin/away - build_path = /obj/item/device/firing_pin/away_site + build_path = /obj/item/firing_pin/away_site /datum/design/item/modular_weapon/modular_small req_tech = list(TECH_MATERIAL = 1) materials = list(DEFAULT_WALL_MATERIAL = 2000) - build_path = /obj/item/device/laser_assembly + build_path = /obj/item/laser_assembly /datum/design/item/modular_weapon/modular_medium req_tech = list(TECH_MATERIAL = 1) materials = list(DEFAULT_WALL_MATERIAL = 4000) - build_path = /obj/item/device/laser_assembly/medium + build_path = /obj/item/laser_assembly/medium /datum/design/item/modular_weapon/modular_large req_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 2) materials = list(DEFAULT_WALL_MATERIAL = 8000) - build_path = /obj/item/device/laser_assembly/large + build_path = /obj/item/laser_assembly/large /datum/design/item/modular_weapon/modular_cap req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) diff --git a/code/modules/research/designs/protolathe/tool_designs.dm b/code/modules/research/designs/protolathe/tool_designs.dm index e5b36b7a039..3c6f6c6b31c 100644 --- a/code/modules/research/designs/protolathe/tool_designs.dm +++ b/code/modules/research/designs/protolathe/tool_designs.dm @@ -24,7 +24,7 @@ desc = "A specialised light replacer which stores more lights, refills faster from boxes, and sucks up broken bulbs." req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4) materials = list(DEFAULT_WALL_MATERIAL = 500) - build_path = /obj/item/device/lightreplacer/advanced + build_path = /obj/item/lightreplacer/advanced /datum/design/item/tool/advmop materials = list(DEFAULT_WALL_MATERIAL = 2500, MATERIAL_GLASS = 200) @@ -35,26 +35,26 @@ req_tech = list(TECH_DATA = 2, TECH_BIO = 3) build_type = PROTOLATHE | MECHFAB materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500) - build_path = /obj/item/device/mmi + build_path = /obj/item/mmi /datum/design/item/tool/mmi_radio name = "Radio-enabled Man-Machine Interface" req_tech = list(TECH_DATA = 2, TECH_BIO = 4) build_type = PROTOLATHE | MECHFAB materials = list(DEFAULT_WALL_MATERIAL = 1200, MATERIAL_GLASS = 500) - build_path = /obj/item/device/mmi/radio_enabled + build_path = /obj/item/mmi/radio_enabled /datum/design/item/tool/mmi_shell name = "AI Shell Control Module" req_tech = list(TECH_DATA = 6, TECH_ENGINEERING = 6) build_type = PROTOLATHE | MECHFAB materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500) - build_path = /obj/item/device/mmi/shell + build_path = /obj/item/mmi/shell /datum/design/item/tool/beacon req_tech = list(TECH_BLUESPACE = 1) materials = list (DEFAULT_WALL_MATERIAL = 20, MATERIAL_GLASS = 10) - build_path = /obj/item/device/radio/beacon + build_path = /obj/item/radio/beacon /datum/design/item/tool/navbeacon req_tech = list(TECH_BLUESPACE = 1) @@ -76,17 +76,17 @@ desc = "Allows for deciphering the stationbound binary channel on-the-fly." req_tech = list(TECH_ILLEGAL = 2) materials = list(DEFAULT_WALL_MATERIAL = 300, MATERIAL_GLASS = 300) - build_path = /obj/item/device/encryptionkey/binary + build_path = /obj/item/encryptionkey/binary /datum/design/item/tool/pin_extractor req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500) - build_path = /obj/item/device/pin_extractor + build_path = /obj/item/pin_extractor /datum/design/item/tool/analyzer req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 3) materials = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20) - build_path = /obj/item/device/analyzer + build_path = /obj/item/analyzer /datum/design/item/tool/tag_scanner req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) @@ -97,7 +97,7 @@ desc = "A hand-held plant scanner for hydroponicists and xenobotanists." req_tech = list(TECH_MAGNET = 2, TECH_BIO = 3) materials = list(DEFAULT_WALL_MATERIAL = 80, MATERIAL_GLASS = 20) - build_path = /obj/item/device/analyzer/plant_analyzer + build_path = /obj/item/analyzer/plant_analyzer /datum/design/item/tool/implanter desc = "A specialized syringe for inserting implants to subjects." @@ -108,7 +108,7 @@ /datum/design/item/tool/paicard req_tech = list(TECH_DATA = 2) materials = list(MATERIAL_GLASS = 500, DEFAULT_WALL_MATERIAL = 500) - build_path = /obj/item/device/paicard + build_path = /obj/item/paicard /datum/design/item/tool/intellicard desc = "Allows for the construction of an intelliCard." @@ -178,4 +178,4 @@ name = "Bluespace Flare" req_tech = list(TECH_BLUESPACE = 4, TECH_MAGNET = 3, TECH_DATA = 2) materials = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 1000, MATERIAL_PHORON = 400) - build_path = /obj/item/device/spaceflare + build_path = /obj/item/spaceflare diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 8a2ada0319a..93e2ad576d7 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -143,7 +143,7 @@ /obj/machinery/r_n_d/server/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_MULTITOOL) - var/obj/item/device/multitool/MT = attacking_item + var/obj/item/multitool/MT = attacking_item var/obj/machinery/r_n_d/tech_processor/TP = MT.get_buffer(/obj/machinery/r_n_d/tech_processor) if(TP) TP.set_server(src) diff --git a/code/modules/research/stockparts.dm b/code/modules/research/stockparts.dm index 5fb38e5fd62..6457531541e 100644 --- a/code/modules/research/stockparts.dm +++ b/code/modules/research/stockparts.dm @@ -33,7 +33,7 @@ storage_slots = 25 can_hold = list( /obj/item/stock_parts, - /obj/item/device/multitool, + /obj/item/multitool, /obj/item/stack/cable_coil ) max_w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/research/tech_processor.dm b/code/modules/research/tech_processor.dm index e25e1e5e79e..cad2b147206 100644 --- a/code/modules/research/tech_processor.dm +++ b/code/modules/research/tech_processor.dm @@ -44,7 +44,7 @@ /obj/machinery/r_n_d/tech_processor/attackby(obj/item/attacking_item, mob/user) if(attacking_item.tool_behaviour == TOOL_MULTITOOL) - var/obj/item/device/multitool/MT = attacking_item + var/obj/item/multitool/MT = attacking_item MT.set_buffer(src) to_chat(user, SPAN_NOTICE("You attach \the [src]'s linking node to \the [MT]'s machinery buffer.")) return diff --git a/code/modules/research/weaponsanalyzer.dm b/code/modules/research/weaponsanalyzer.dm index 249c5762dcf..21169e3ce25 100644 --- a/code/modules/research/weaponsanalyzer.dm +++ b/code/modules/research/weaponsanalyzer.dm @@ -29,20 +29,20 @@ H.drop_from_inventory(attacking_item) attacking_item.forceMove(src) update_icon() - else if(istype(attacking_item, /obj/item/device/laser_assembly)) + else if(istype(attacking_item, /obj/item/laser_assembly)) check_swap(user, attacking_item) - var/obj/item/device/laser_assembly/A = attacking_item + var/obj/item/laser_assembly/A = attacking_item A.ready_to_craft = TRUE item = A H.drop_from_inventory(attacking_item) attacking_item.forceMove(src) A.analyzer = WEAKREF(src) update_icon() - else if(istype(attacking_item, /obj/item/laser_components) && istype(item, /obj/item/device/laser_assembly)) + else if(istype(attacking_item, /obj/item/laser_components) && istype(item, /obj/item/laser_assembly)) if(process) to_chat(user, SPAN_WARNING("\The [src] is busy installing a component already.")) return - var/obj/item/device/laser_assembly/A = item + var/obj/item/laser_assembly/A = item var/success = A.attackby(attacking_item, user) if(!success) return @@ -73,8 +73,8 @@ /obj/machinery/r_n_d/weapons_analyzer/proc/check_swap(var/mob/user, var/obj/I) if(item) to_chat(user, SPAN_NOTICE("You swap \the [item] out for \the [I].")) - if(istype(item, /obj/item/device/laser_assembly)) - var/obj/item/device/laser_assembly/A = item + if(istype(item, /obj/item/laser_assembly)) + var/obj/item/laser_assembly/A = item A.ready_to_craft = FALSE A.analyzer = null item.forceMove(get_turf(src)) @@ -90,8 +90,8 @@ if(use_check_and_message(usr)) return - if(istype(item, /obj/item/device/laser_assembly)) - var/obj/item/device/laser_assembly/A = item + if(istype(item, /obj/item/laser_assembly)) + var/obj/item/laser_assembly/A = item A.ready_to_craft = FALSE A.analyzer = null A.forceMove(get_turf(src)) @@ -112,8 +112,8 @@ var/icon/Icon_used - if(istype(item, /obj/item/device/laser_assembly)) - var/obj/item/device/laser_assembly/A = item + if(istype(item, /obj/item/laser_assembly)) + var/obj/item/laser_assembly/A = item A.update_icon() icon_state = process ? "[icon_state]_working" : "[icon_state]_on" Icon_used = new /icon(item.icon, item.icon_state) @@ -132,8 +132,8 @@ /obj/machinery/r_n_d/weapons_analyzer/ui_data(mob/user) var/list/data = list() - if(istype(item, /obj/item/device/laser_assembly)) - var/obj/item/device/laser_assembly/assembly = item + if(istype(item, /obj/item/laser_assembly)) + var/obj/item/laser_assembly/assembly = item var/list/mods = list() for(var/i in list(assembly.capacitor, assembly.focusing_lens, assembly.modulator) + assembly.gun_mods) var/obj/item/laser_components/l_component = i @@ -252,7 +252,7 @@ /obj/machinery/r_n_d/weapons_analyzer/ui_interact(mob/user, var/datum/tgui/ui) var/height = item ? 600: 300 var/width = item ? 500 : 300 - if(istype(item, /obj/item/gun/energy/laser/prototype) || istype(item, /obj/item/device/laser_assembly)) + if(istype(item, /obj/item/gun/energy/laser/prototype) || istype(item, /obj/item/laser_assembly)) width = 600 ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm index 7a5d11ccc14..b02381e782e 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm @@ -50,21 +50,21 @@ excavation_level = rand(5,50) /obj/structure/boulder/attackby(obj/item/attacking_item, mob/user) - if (istype(attacking_item, /obj/item/device/core_sampler)) + if (istype(attacking_item, /obj/item/core_sampler)) src.geologic_data.artifact_distance = rand(-100,100) / 100 src.geologic_data.artifact_id = artifact_find.artifact_id - var/obj/item/device/core_sampler/C = attacking_item + var/obj/item/core_sampler/C = attacking_item C.sample_item(src, user) return - if (istype(attacking_item, /obj/item/device/depth_scanner)) - var/obj/item/device/depth_scanner/C = attacking_item + if (istype(attacking_item, /obj/item/depth_scanner)) + var/obj/item/depth_scanner/C = attacking_item C.scan_atom(user, src) return - if (istype(attacking_item, /obj/item/device/measuring_tape)) - var/obj/item/device/measuring_tape/P = attacking_item + if (istype(attacking_item, /obj/item/measuring_tape)) + var/obj/item/measuring_tape/P = attacking_item user.visible_message(SPAN_NOTICE("[user] extends [P] towards [src]."), SPAN_NOTICE("You extend [P] towards [src].")) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm index 07271c5c112..28e2a584e02 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm @@ -29,17 +29,17 @@ /mob/living/simple_animal/hostile/mimic,\ /mob/living/simple_animal/hostile/viscerator,\ /mob/living/simple_animal/hostile/hivebot,\ - /obj/item/device/analyzer,\ - /obj/item/device/camera,\ - /obj/item/device/flash,\ - /obj/item/device/flashlight,\ - /obj/item/device/healthanalyzer,\ - /obj/item/device/breath_analyzer,\ - /obj/item/device/multitool,\ - /obj/item/device/paicard,\ - /obj/item/device/radio,\ - /obj/item/device/radio/headset,\ - /obj/item/device/radio/beacon,\ + /obj/item/analyzer,\ + /obj/item/camera,\ + /obj/item/flash,\ + /obj/item/flashlight,\ + /obj/item/healthanalyzer,\ + /obj/item/breath_analyzer,\ + /obj/item/multitool,\ + /obj/item/paicard,\ + /obj/item/radio,\ + /obj/item/radio/headset,\ + /obj/item/radio/beacon,\ /obj/item/autopsy_scanner,\ /obj/item/bikehorn,\ /obj/item/surgery/bonesetter,\ diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 9027860d04d..2d3883aeeab 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -65,8 +65,8 @@ w.use(1) return - else if(istype(attacking_item, /obj/item/device/core_sampler/)) - var/obj/item/device/core_sampler/S = attacking_item + else if(istype(attacking_item, /obj/item/core_sampler/)) + var/obj/item/core_sampler/S = attacking_item S.sample_item(src, user) return @@ -281,7 +281,7 @@ if(prob(10)) apply_image_decorations = 1 if(prob(25)) - new_item = new /obj/item/device/soulstone(src.loc) + new_item = new /obj/item/soulstone(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = icon_state if(17) @@ -291,7 +291,7 @@ apply_material_decorations = 0 apply_image_decorations = 0 if(18) - new_item = new /obj/item/device/radio/beacon(src.loc) + new_item = new /obj/item/radio/beacon(src.loc) talkative = 0 new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "unknown[rand(1,4)]" @@ -314,7 +314,7 @@ if(21) //soulstone apply_prefix = 0 - new_item = new /obj/item/device/soulstone(src.loc) + new_item = new /obj/item/soulstone(src.loc) item_type = new_item.name apply_material_decorations = 0 if(22) diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index 4dbe40bf51e..e1c35d7f530 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -25,7 +25,7 @@ new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/sneakers/medsci(src) new /obj/item/clothing/glasses/safety/goggles/science(src) - new /obj/item/device/radio/headset/headset_sci(src) + new /obj/item/radio/headset/headset_sci(src) new /obj/item/storage/belt/archaeology(src) new /obj/item/storage/box/unique/excavation(src) new /obj/item/taperoll/science(src) @@ -40,22 +40,22 @@ /obj/structure/closet/excavation/fill() new /obj/item/storage/belt/archaeology(src) new /obj/item/storage/box/unique/excavation(src) - new /obj/item/device/flashlight/lantern(src) - new /obj/item/device/ano_scanner(src) - new /obj/item/device/depth_scanner(src) - new /obj/item/device/core_sampler(src) - new /obj/item/device/gps/science(src) - new /obj/item/device/beacon_locator(src) - new /obj/item/device/radio/beacon(src) + new /obj/item/flashlight/lantern(src) + new /obj/item/ano_scanner(src) + new /obj/item/depth_scanner(src) + new /obj/item/core_sampler(src) + new /obj/item/gps/science(src) + new /obj/item/beacon_locator(src) + new /obj/item/radio/beacon(src) new /obj/item/pickaxe(src) new /obj/item/material/hatchet/machete/steel(src) new /obj/item/clothing/accessory/holster/utility/machete(src) - new /obj/item/device/measuring_tape(src) + new /obj/item/measuring_tape(src) new /obj/item/pickaxe/hand(src) new /obj/item/storage/bag/fossils(src) - new /obj/item/device/hand_labeler(src) + new /obj/item/hand_labeler(src) new /obj/item/ore_detector(src) - new /obj/item/device/spaceflare(src) + new /obj/item/spaceflare(src) new /obj/item/tent(src) // 2 Drills diff --git a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm index 6d08c9ee643..9ff64bd9ec7 100644 --- a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm +++ b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm @@ -50,7 +50,7 @@ BIO = 100, RAD = 100, ) - allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit) contained_sprite = FALSE icon = 'icons/obj/clothing/suits.dmi' anomaly_protection = 0.5 diff --git a/code/modules/research/xenoarchaeology/tools/gearbelt.dm b/code/modules/research/xenoarchaeology/tools/gearbelt.dm index 2b268d7fd16..492d066fa61 100644 --- a/code/modules/research/xenoarchaeology/tools/gearbelt.dm +++ b/code/modules/research/xenoarchaeology/tools/gearbelt.dm @@ -6,17 +6,17 @@ storage_slots = 10 can_hold = list( /obj/item/storage/box/samplebags, - /obj/item/device/core_sampler, - /obj/item/device/beacon_locator, - /obj/item/device/radio/beacon, - /obj/item/device/gps, - /obj/item/device/radio, - /obj/item/device/measuring_tape, - /obj/item/device/flashlight, + /obj/item/core_sampler, + /obj/item/beacon_locator, + /obj/item/radio/beacon, + /obj/item/gps, + /obj/item/radio, + /obj/item/measuring_tape, + /obj/item/flashlight, /obj/item/pickaxe, - /obj/item/device/depth_scanner, - /obj/item/device/camera, - /obj/item/device/camera_film, + /obj/item/depth_scanner, + /obj/item/camera, + /obj/item/camera_film, /obj/item/paper, /obj/item/photo, /obj/item/folder, @@ -28,20 +28,20 @@ /obj/item/wrench, /obj/item/storage/box/unique/excavation, /obj/item/anobattery, - /obj/item/device/ano_scanner, + /obj/item/ano_scanner, /obj/item/ore_detector, - /obj/item/device/spaceflare + /obj/item/spaceflare ) /obj/item/storage/belt/archaeology/full starts_with = list( - /obj/item/device/core_sampler = 1, - /obj/item/device/gps = 1, - /obj/item/device/measuring_tape = 1, + /obj/item/core_sampler = 1, + /obj/item/gps = 1, + /obj/item/measuring_tape = 1, /obj/item/pickaxe/hand = 1, /obj/item/storage/box/unique/excavation = 1, - /obj/item/device/depth_scanner = 1, - /obj/item/device/ano_scanner = 1, + /obj/item/depth_scanner = 1, + /obj/item/ano_scanner = 1, /obj/item/ore_detector = 1, /obj/item/wrench = 1 ) diff --git a/code/modules/research/xenoarchaeology/tools/tools.dm b/code/modules/research/xenoarchaeology/tools/tools.dm index cc59a5574bb..7b8ca14dbac 100644 --- a/code/modules/research/xenoarchaeology/tools/tools.dm +++ b/code/modules/research/xenoarchaeology/tools/tools.dm @@ -2,7 +2,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Miscellaneous xenoarchaeology tools -/obj/item/device/measuring_tape +/obj/item/measuring_tape name = "measuring tape" desc = "A coiled metallic tape used to check dimensions and lengths." icon = 'icons/obj/xenoarchaeology.dmi' diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm index 09c0cc4b50f..8108ece7bbc 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm @@ -1,5 +1,5 @@ -/obj/item/device/ano_scanner +/obj/item/ano_scanner name = "Alden-Saraspova counter" desc = "Aids in triangulation of exotic particles." icon = 'icons/obj/xenoarchaeology.dmi' @@ -12,14 +12,14 @@ var/last_scan_time = 0 var/scan_delay = 25 -/obj/item/device/ano_scanner/Initialize() +/obj/item/ano_scanner/Initialize() . = ..() scan() -/obj/item/device/ano_scanner/attack_self(var/mob/user as mob) +/obj/item/ano_scanner/attack_self(var/mob/user as mob) return src.interact(user) -/obj/item/device/ano_scanner/interact(var/mob/user as mob) +/obj/item/ano_scanner/interact(var/mob/user as mob) if(world.time - last_scan_time >= scan_delay) spawn(0) scan() @@ -34,7 +34,7 @@ else to_chat(user, "Scanning array is recharging.") -/obj/item/device/ano_scanner/proc/scan() +/obj/item/ano_scanner/proc/scan() last_scan_time = world.time nearest_artifact_distance = -1 var/turf/cur_turf = get_turf(src) diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index 82eac0d361b..0ffbbb8acce 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -14,7 +14,7 @@ ////////////////////////////////////////////////////////////////// -/obj/item/device/core_sampler +/obj/item/core_sampler name = "core sampler" desc = "Used to extract geological core samples." icon = 'icons/obj/xenoarchaeology.dmi' @@ -23,12 +23,12 @@ w_class = WEIGHT_CLASS_TINY var/obj/item/sample -/obj/item/device/core_sampler/feedback_hints(mob/user, distance, is_adjacent) +/obj/item/core_sampler/feedback_hints(mob/user, distance, is_adjacent) . += ..() if(distance <= 2) . += SPAN_NOTICE("This one is [sample ? "full" : "empty"].") -/obj/item/device/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user) +/obj/item/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user) var/datum/geosample/geo_data if(istype(item_to_sample, /turf/simulated/mineral)) @@ -49,10 +49,10 @@ else to_chat(user, SPAN_WARNING("You are unable to take a geological sample of [item_to_sample].")) -/obj/item/device/core_sampler/update_icon() +/obj/item/core_sampler/update_icon() icon_state = "sampler[!!sample]" -/obj/item/device/core_sampler/attack_self(var/mob/living/user) +/obj/item/core_sampler/attack_self(var/mob/living/user) if(sample) to_chat(user, SPAN_NOTICE("You eject the sample.")) user.put_in_hands(sample) diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 3445aadef7f..547b52f7e2e 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -3,7 +3,7 @@ // Depth scanner - scans rock turfs / boulders and tells players if there is anything interesting inside, logs all finds + coordinates + times //also known as the x-ray diffractor -/obj/item/device/depth_scanner +/obj/item/depth_scanner name = "depth analysis scanner" desc = "Used to check spatial depth and density of rock outcroppings." icon = 'icons/obj/xenoarchaeology.dmi' @@ -23,7 +23,7 @@ var/dissonance_spread = 1 var/material = "unknown" -/obj/item/device/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A) +/obj/item/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A) user.visible_message(SPAN_NOTICE("[user] scans [A], the air around them humming gently.")) if(istype(A,/turf/simulated/mineral)) var/turf/simulated/mineral/M = A @@ -69,10 +69,10 @@ to_chat(L, SPAN_NOTICE("[icon2html(src, L)] [src] pings [pick("madly","wildly","excitedly","crazily")]!")) playsound(loc, 'sound/machines/triplebeep.ogg', 40) -/obj/item/device/depth_scanner/attack_self(var/mob/user as mob) +/obj/item/depth_scanner/attack_self(var/mob/user as mob) return src.interact(user) -/obj/item/device/depth_scanner/interact(var/mob/user as mob) +/obj/item/depth_scanner/interact(var/mob/user as mob) var/dat = "Co-ordinates with positive matches
" dat += "== Clear all ==
" if(current) @@ -108,7 +108,7 @@ scanner_win.set_content(dat) scanner_win.open() -/obj/item/device/depth_scanner/Topic(href, href_list) +/obj/item/depth_scanner/Topic(href, href_list) ..() usr.set_machine(src) diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index 2ca51b958b8..a99f29007e4 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -2,7 +2,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // GPS Locater - locks into a radio frequency and tracks it -/obj/item/device/beacon_locator +/obj/item/beacon_locator name = "locater device" desc = "Used to scan and locate signals on a particular frequency according ." icon = 'icons/obj/item/pinpointer.dmi' @@ -10,17 +10,17 @@ item_state = "electronic" var/frequency = PUB_FREQ var/scan_ticks = 0 - var/obj/item/device/radio/target_radio + var/obj/item/radio/target_radio -/obj/item/device/beacon_locator/Initialize() +/obj/item/beacon_locator/Initialize() . = ..() START_PROCESSING(SSprocessing, src) -/obj/item/device/beacon_locator/Destroy() +/obj/item/beacon_locator/Destroy() STOP_PROCESSING(SSprocessing, src) return ..() -/obj/item/device/beacon_locator/process() +/obj/item/beacon_locator/process() if(target_radio) set_dir(get_dir(src,target_radio)) switch(get_dist(src,target_radio)) @@ -40,7 +40,7 @@ if(datum_flags & DF_ISPROCESSING) //scan radios in the world to try and find one var/cur_dist = 999 - for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons) + for(var/obj/item/radio/beacon/R in GLOB.teleportbeacons) if(R.z == src.z && R.get_frequency() == src.frequency) var/check_dist = get_dist(src,R) if(check_dist < cur_dist) @@ -56,10 +56,10 @@ else icon_state = "pinoff" -/obj/item/device/beacon_locator/attack_self(var/mob/user as mob) +/obj/item/beacon_locator/attack_self(var/mob/user as mob) return src.interact(user) -/obj/item/device/beacon_locator/interact(var/mob/user as mob) +/obj/item/beacon_locator/interact(var/mob/user as mob) var/dat = "Radio frequency tracker
" dat += {" Reset tracker
@@ -75,7 +75,7 @@ user << browse(HTML_SKELETON(dat),"window=locater;size=300x150") onclose(user, "locater") -/obj/item/device/beacon_locator/Topic(href, href_list) +/obj/item/beacon_locator/Topic(href, href_list) ..() usr.set_machine(src) diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 19fc71098c5..dab1429ee4e 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -210,7 +210,7 @@ qdel(S) ..() -/obj/item/device/spaceflare +/obj/item/spaceflare name = "bluespace flare" desc = "Burst transmitter used to broadcast all needed information for shuttle navigation systems. Has a flare attached for marking the spot where you probably shouldn't be standing." icon = 'icons/obj/space_flare.dmi' @@ -222,11 +222,11 @@ /// The shuttle landmark synced to this beacon. This is set when the beacon is activated. var/obj/effect/shuttle_landmark/automatic/spaceflare/landmark -/obj/item/device/spaceflare/attack_self(var/mob/user) +/obj/item/spaceflare/attack_self(var/mob/user) if(activate(user)) user.visible_message(SPAN_NOTICE("\The [user] pulls the cord, activating \the [src]."), SPAN_NOTICE("You pull the cord, activating \the [src]."), SPAN_ITALIC("You hear the sound of something being struck and ignited.")) -/obj/item/device/spaceflare/proc/activate(mob/user) +/obj/item/spaceflare/proc/activate(mob/user) if(active) to_chat(user, SPAN_WARNING("\The [src] is already active.")) return FALSE @@ -247,7 +247,7 @@ update_icon() return TRUE -/obj/item/device/spaceflare/proc/deactivate(silent = FALSE) +/obj/item/spaceflare/proc/deactivate(silent = FALSE) if (!active) return FALSE @@ -259,7 +259,7 @@ visible_message(SPAN_WARNING("\The [src] stops burning and deactivates.")) return TRUE -/obj/item/device/spaceflare/update_icon() +/obj/item/spaceflare/update_icon() if (active) icon_state = "[initial(icon_state)]_on" set_light(0.3, 0.1, 6, 2, "85d1ff") @@ -267,11 +267,11 @@ icon_state = initial(icon_state) set_light(0) -/obj/item/device/spaceflare/Destroy() +/obj/item/spaceflare/Destroy() deactivate(TRUE) . = ..() -/obj/item/device/spaceflare/attack_hand(mob/user) +/obj/item/spaceflare/attack_hand(mob/user) if(active) var/choice = tgui_alert(user, "Do you want to deactivate \the [src]?", "Bluespace Flare", list("Yes","No")) if(choice == "Yes") @@ -284,9 +284,9 @@ /obj/effect/shuttle_landmark/automatic/spaceflare name = "Bluespace Beacon Signal" /// The beacon object synced to this landmark. If this is ever null or qdeleted the landmark should delete itself. - var/obj/item/device/spaceflare/beacon + var/obj/item/spaceflare/beacon -/obj/effect/shuttle_landmark/automatic/spaceflare/Initialize(mapload, obj/item/device/spaceflare/beacon) +/obj/effect/shuttle_landmark/automatic/spaceflare/Initialize(mapload, obj/item/spaceflare/beacon) . = ..() if(!istype(beacon)) diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 9aa2cab1444..9980d1a0dfd 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -11,7 +11,7 @@ var/specops_return_delay = 6000 //After moving, the amount of time that must pass before the shuttle may move again var/specops_countdown_time = 600 //Length of the countdown when moving the shuttle - var/obj/item/device/radio/intercom/announcer + var/obj/item/radio/intercom/announcer var/reset_time = 0 //the world.time at which the shuttle will be ready to move again. var/launch_prep = 0 var/cancel_countdown = 0 @@ -19,7 +19,7 @@ /datum/shuttle/autodock/ferry/specops/New() ..() - announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. + announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. announcer.config(list("Response Team" = 0)) /datum/shuttle/autodock/ferry/specops/proc/radio_announce(var/message) diff --git a/code/modules/spell_system/artifacts/items/poppet.dm b/code/modules/spell_system/artifacts/items/poppet.dm index 8318c6406cd..d0e53c2a896 100644 --- a/code/modules/spell_system/artifacts/items/poppet.dm +++ b/code/modules/spell_system/artifacts/items/poppet.dm @@ -88,7 +88,7 @@ playsound(get_turf(H), 'sound/weapons/Egloves.ogg', 50, 1, -1) return TRUE - if(istype(attacking_item, /obj/item/device/flashlight)) + if(istype(attacking_item, /obj/item/flashlight)) to_chat(H, SPAN_WARNING("You direct \the [attacking_item] towards \the [src]'s eyes!")) playsound(get_turf(H), 'sound/items/flashlight.ogg', 50, 1, -1) H.flash_act() diff --git a/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/summon_soulstone.dm b/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/summon_soulstone.dm index a2f34d00f3c..f33d447735d 100644 --- a/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/summon_soulstone.dm +++ b/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/summon_soulstone.dm @@ -8,7 +8,7 @@ invocation_type = SpI_NONE range = 0 - summon_type = list(/obj/item/device/soulstone) + summon_type = list(/obj/item/soulstone) hud_state = "const_stone" override_base = "const" diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 5222502093a..9d663ef2ee7 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -95,7 +95,7 @@ //How much hallucination should it produce per unit of power? var/config_hallucination_power = 0.1 - var/obj/item/device/radio/radio + var/obj/item/radio/radio var/debug = 0 var/last_message_time = -100 //for message @@ -119,7 +119,7 @@ /obj/machinery/power/supermatter/Initialize() . = ..() - radio = new /obj/item/device/radio{channels=list("Engineering")}(src) + radio = new /obj/item/radio{channels=list("Engineering")}(src) soundloop = new(src, TRUE) /obj/machinery/power/supermatter/Destroy() diff --git a/code/modules/surgery/facial_surgery.dm b/code/modules/surgery/facial_surgery.dm index 647e27a7163..6bb7f408ae1 100644 --- a/code/modules/surgery/facial_surgery.dm +++ b/code/modules/surgery/facial_surgery.dm @@ -52,7 +52,7 @@ allowed_tools = list( TOOL_HEMOSTAT = 100, \ TOOL_CABLECOIL = 75, \ - /obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. + /obj/item/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. ) min_duration = 30 @@ -199,7 +199,7 @@ allowed_tools = list( TOOL_MULTITOOL = 100, \ TOOL_CABLECOIL = 75, \ - /obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. + /obj/item/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. ) min_duration = 30 diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 35da56b46c6..47bad275177 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -200,7 +200,7 @@ allowed_tools = list( TOOL_HEMOSTAT = 100, \ TOOL_CABLECOIL = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/assembly/mousetrap = 20 ) min_duration = 20 diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index e2b40c71e02..686b6ae9825 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -54,7 +54,7 @@ allowed_tools = list( TOOL_HEMOSTAT = 100, \ TOOL_CABLECOIL = 75, \ - /obj/item/device/assembly/mousetrap = 20 + /obj/item/assembly/mousetrap = 20 ) can_infect = TRUE diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index e165161d329..2d83360d4ba 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -376,7 +376,7 @@ /singleton/surgery_step/robotics/install_mmi name = "Install MMI" allowed_tools = list( - /obj/item/device/mmi = 100 + /obj/item/mmi = 100 ) min_duration = 40 @@ -389,7 +389,7 @@ if(target_zone != BP_HEAD) return FALSE - var/obj/item/device/mmi/M = tool + var/obj/item/mmi/M = tool var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!(affected && affected.open == ORGAN_ENCASED_RETRACTED)) return FALSE @@ -434,7 +434,7 @@ user.visible_message("[user] has installed \the [tool] into [target]'s [affected.name].", \ SPAN_NOTICE("You have installed \the [tool] into [target]'s [affected.name].")) - var/obj/item/device/mmi/M = tool + var/obj/item/mmi/M = tool var/obj/item/organ/internal/machine/posibrain/holder = new(target, 1) target.internal_organs_by_name[BP_BRAIN] = holder user.drop_from_inventory(tool,holder) diff --git a/code/modules/synthesized_instruments/docs/Structure.txt b/code/modules/synthesized_instruments/docs/Structure.txt index 62444b7e134..0d8e9a036e1 100644 --- a/code/modules/synthesized_instruments/docs/Structure.txt +++ b/code/modules/synthesized_instruments/docs/Structure.txt @@ -5,9 +5,9 @@ Sound player -- used to apply modification to all sounds emitted. Represents the further modify sound more you'd start from here) Synthesized Song - just like /datum/song it's what parses and plays a melody --- -Real instruments inherit from either /obj/structure/synthesized_instrument (static musical instrument) or /obj/item/device/synthesized_instrument (handheld musical instrument) +Real instruments inherit from either /obj/structure/synthesized_instrument (static musical instrument) or /obj/item/synthesized_instrument (handheld musical instrument) --- -Virtual instruments all inherit from /datum/instrument. +Virtual instruments all inherit from /datum/instrument. Virtual instruments should follow this structure: /datum/instrument/category_name/instrument_name. Refer to any file in ./instrument_data to see how it's done. @@ -15,4 +15,4 @@ Refer to any file in ./instrument_data to see how it's done. Sound player inherits from /datum/sound_player --- For synthesized song only use /datum/synthesized_song ---- \ No newline at end of file +--- diff --git a/code/modules/synthesized_instruments/real_instruments.dm b/code/modules/synthesized_instruments/real_instruments.dm index 4426495433a..a0f0dde1dd3 100644 --- a/code/modules/synthesized_instruments/real_instruments.dm +++ b/code/modules/synthesized_instruments/real_instruments.dm @@ -262,14 +262,14 @@ //////////////////////// -/obj/item/device/synthesized_instrument +/obj/item/synthesized_instrument var/datum/real_instrument/real_instrument icon = 'icons/obj/musician.dmi' var/list/datum/instrument/instruments = list() var/path = /datum/instrument var/sound_player = /datum/sound_player -/obj/item/device/synthesized_instrument/Initialize() +/obj/item/synthesized_instrument/Initialize() . = ..() for (var/type in typesof(path)) var/datum/instrument/new_instrument = new type @@ -278,7 +278,7 @@ src.instruments[new_instrument.name] = new_instrument src.real_instrument = new /datum/real_instrument(src, new sound_player(src, instruments[pick(instruments)]), instruments) -/obj/item/device/synthesized_instrument/Destroy() +/obj/item/synthesized_instrument/Destroy() QDEL_NULL(src.real_instrument) if (islist(instruments)) var/list/as_list = instruments @@ -288,23 +288,23 @@ . = ..() -/obj/item/device/synthesized_instrument/attack_self(mob/user as mob) +/obj/item/synthesized_instrument/attack_self(mob/user as mob) src.interact(user) -/obj/item/device/synthesized_instrument/interact(mob/user) // CONDITIONS ..(user) that shit in subclasses +/obj/item/synthesized_instrument/interact(mob/user) // CONDITIONS ..(user) that shit in subclasses src.ui_interact(user) -/obj/item/device/synthesized_instrument/ui_interact(mob/user, ui_key = "instrument", datum/nanoui/ui = null, force_open = 0) +/obj/item/synthesized_instrument/ui_interact(mob/user, ui_key = "instrument", datum/nanoui/ui = null, force_open = 0) if (real_instrument) real_instrument.ui_call(user,ui_key,ui,force_open) -/obj/item/device/synthesized_instrument/proc/shouldStopPlaying(mob/user) +/obj/item/synthesized_instrument/proc/shouldStopPlaying(mob/user) return !(src && in_range(src, user)) -/obj/item/device/synthesized_instrument/Topic(href, href_list) +/obj/item/synthesized_instrument/Topic(href, href_list) if (..()) return 1 diff --git a/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm b/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm index afbef1e255b..b876835cdd0 100644 --- a/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm +++ b/code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm @@ -1,4 +1,4 @@ -/obj/item/device/synthesized_instrument/guitar +/obj/item/synthesized_instrument/guitar name = "guitar" desc = "A wooden musical instrument with six strings. This one looks like it may actually work." icon = 'icons/obj/musician.dmi' @@ -9,7 +9,7 @@ path = /datum/instrument/guitar/clean_crisis -/obj/item/device/synthesized_instrument/guitar/multi +/obj/item/synthesized_instrument/guitar/multi name = "Polyguitar" desc = "An instrument for a more ass-kicking era." icon = 'icons/obj/musician.dmi' diff --git a/code/modules/synthesized_instruments/real_instruments/Synthesizer/synthesizer.dm b/code/modules/synthesized_instruments/real_instruments/Synthesizer/synthesizer.dm index 1999eb8f9f3..45f91bbcfb3 100644 --- a/code/modules/synthesized_instruments/real_instruments/Synthesizer/synthesizer.dm +++ b/code/modules/synthesized_instruments/real_instruments/Synthesizer/synthesizer.dm @@ -42,7 +42,7 @@ //in-hand version -/obj/item/device/synthesized_instrument/synthesizer +/obj/item/synthesized_instrument/synthesizer name = "Synthesizer Mini" desc = "The power of an entire orchestra in a handy midi keyboard format." icon_state = "h_synthesizer" diff --git a/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm b/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm index e57d91ef207..7a3c8c9aceb 100644 --- a/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm +++ b/code/modules/synthesized_instruments/real_instruments/Trumpet/trumpet.dm @@ -1,4 +1,4 @@ -/obj/item/device/synthesized_instrument/trumpet +/obj/item/synthesized_instrument/trumpet name = "Omnitrumpet" desc = "The Omnitrumptet series 400 with more than 30 sound samples and fully customizable high fidelity output provides the ultimate means to toot your own horn." icon_state = "trumpet" diff --git a/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm b/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm index 96cf920368e..5f4d452a4c4 100644 --- a/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm +++ b/code/modules/synthesized_instruments/real_instruments/Violin/violin.dm @@ -3,7 +3,7 @@ range = 10 //Kinda don't want this horrible thing to be heard from far away // This is based on an obsolete violin implementation, but we don't have anything better to use -/obj/item/device/synthesized_instrument/violin +/obj/item/synthesized_instrument/violin name = "violin" desc = "A wooden musical instrument with four strings and a bow, it is quite old" icon = 'icons/obj/musician.dmi' diff --git a/code/modules/synthesized_instruments/sound_player.dm b/code/modules/synthesized_instruments/sound_player.dm index bfce2636958..6eb5afe5502 100644 --- a/code/modules/synthesized_instruments/sound_player.dm +++ b/code/modules/synthesized_instruments/sound_player.dm @@ -73,7 +73,7 @@ /datum/sound_player/proc/shouldStopPlaying(mob/user) var/obj/structure/synthesized_instrument/S = actual_instrument - var/obj/item/device/synthesized_instrument/D = actual_instrument + var/obj/item/synthesized_instrument/D = actual_instrument if(istype(S)) return S.shouldStopPlaying(user) if(istype(D)) diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 6b0948baf56..cc3ea9817af 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -1,9 +1,9 @@ GLOBAL_LIST_EMPTY(gps_list) -/obj/item/device/gps +/obj/item/gps name = "global positioning system" desc = "Helping lost spacemen find their way through the planets since 2016." - icon = 'icons/obj/item/device/gps.dmi' + icon = 'icons/obj/item/gps.dmi' icon_state = "gps-com" item_state = "radio" w_class = WEIGHT_CLASS_SMALL @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(gps_list) var/process_interval = 6 SECONDS var/last_process = 0 -/obj/item/device/gps/Initialize() +/obj/item/gps/Initialize() . = ..() compass = new(src) gpstag = next_initial_tag() @@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(gps_list) START_PROCESSING(SSprocessing, src) -/obj/item/device/gps/Destroy() +/obj/item/gps/Destroy() GLOB.gps_list -= GLOB.gps_list[gpstag] UnregisterSignal(src, COMSIG_MOVABLE_MOVED) if(held_by) @@ -73,14 +73,14 @@ GLOBAL_LIST_EMPTY(gps_list) STOP_PROCESSING(SSprocessing, src) return ..() -/obj/item/device/gps/attack_self(mob/user, modifiers) +/obj/item/gps/attack_self(mob/user, modifiers) if(!emped) ui_interact(user) var/turf/T = get_turf(src) to_chat(user, SPAN_NOTICE("[icon2html(src, user)] [src] flashes [T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)].")) -/obj/item/device/gps/update_icon() +/obj/item/gps/update_icon() ClearOverlays() if(emped) AddOverlays("emp") @@ -89,7 +89,7 @@ GLOBAL_LIST_EMPTY(gps_list) else AddOverlays("confused") -/obj/item/device/gps/pickup(var/mob/user) +/obj/item/gps/pickup(var/mob/user) ..() if(held_by) UnregisterSignal(held_by, COMSIG_MOVABLE_MOVED) @@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(gps_list) RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(update_position), TRUE) update_icon() -/obj/item/device/gps/dropped(mob/user) +/obj/item/gps/dropped(mob/user) ..() if(isturf(loc)) held_by = null @@ -106,27 +106,27 @@ GLOBAL_LIST_EMPTY(gps_list) user.client.screen -= compass update_icon() -/obj/item/device/gps/on_slotmove(mob/user, slot) +/obj/item/gps/on_slotmove(mob/user, slot) . = ..() if(user.client && !(slot == slot_r_hand || slot == slot_l_hand)) user.client.screen -= compass -/obj/item/device/gps/equipped(mob/user, slot) +/obj/item/gps/equipped(mob/user, slot) . = ..() if(user.client && (slot == slot_r_hand || slot == slot_l_hand)) user.client.screen |= compass -/obj/item/device/gps/on_module_activate(mob/living/silicon/robot/R) +/obj/item/gps/on_module_activate(mob/living/silicon/robot/R) ..() if(R.client) R.client.screen |= compass -/obj/item/device/gps/on_module_deactivate(mob/living/silicon/robot/R) +/obj/item/gps/on_module_deactivate(mob/living/silicon/robot/R) ..() if(R.client) R.client.screen -= compass -/obj/item/device/gps/emp_act(severity) +/obj/item/gps/emp_act(severity) . = ..() emped = TRUE @@ -134,12 +134,12 @@ GLOBAL_LIST_EMPTY(gps_list) update_icon() update_position() -/obj/item/device/gps/proc/post_emp() +/obj/item/gps/proc/post_emp() emped = FALSE update_icon() update_position() -/obj/item/device/gps/ui_data(mob/user) +/obj/item/gps/ui_data(mob/user) var/list/data = list() data["own_tag"] = gpstag @@ -158,18 +158,18 @@ GLOBAL_LIST_EMPTY(gps_list) return data -/obj/item/device/gps/ui_interact(mob/user, var/datum/tgui/ui) +/obj/item/gps/ui_interact(mob/user, var/datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "GPS", capitalize_first_letters(name), 550, 650) ui.open() -/obj/item/device/gps/process() +/obj/item/gps/process() if(held_by || implanted_into || (world.time < last_process + process_interval)) return update_position(FALSE) -/obj/item/device/gps/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) +/obj/item/gps/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) return @@ -239,7 +239,7 @@ GLOBAL_LIST_EMPTY(gps_list) return FALSE -/obj/item/device/gps/proc/update_position(var/check_held_by = TRUE) +/obj/item/gps/proc/update_position(var/check_held_by = TRUE) var/turf/T = get_turf(src) if(check_held_by && held_by && (held_by.x != T.x || held_by.y != T.y || held_by.z != T.z) && held_by != recursive_loc_turf_check(src, 3, held_by)) UnregisterSignal(held_by, COMSIG_MOVABLE_MOVED) @@ -268,7 +268,7 @@ GLOBAL_LIST_EMPTY(gps_list) if(check_held_by && held_by && (held_by.get_active_hand() == src || held_by.get_inactive_hand() == src)) update_compass(TRUE) -/obj/item/device/gps/proc/update_compass(var/update_compass_icon) +/obj/item/gps/proc/update_compass(var/update_compass_icon) compass.hide_waypoints(FALSE) if(LAZYLEN(tracking_compass)) for(var/tracking_tag in tracking_compass - gpstag) @@ -284,7 +284,7 @@ GLOBAL_LIST_EMPTY(gps_list) compass.show_waypoint(tracking_tag) compass.rebuild_overlay_lists(update_compass_icon) -/obj/item/device/gps/proc/next_initial_tag() +/obj/item/gps/proc/next_initial_tag() if(!LAZYACCESS(gps_count, gps_prefix)) gps_count[gps_prefix] = 0 @@ -293,38 +293,38 @@ GLOBAL_LIST_EMPTY(gps_list) if(GLOB.gps_list[.]) // if someone has renamed a GPS manually to take this tag already . = next_initial_tag() -/obj/item/device/gps/science +/obj/item/gps/science icon_state = "gps-sci" gps_prefix = "SCI" compass_color = "#993399" gpstag = "SCI0" -/obj/item/device/gps/engineering +/obj/item/gps/engineering icon_state = "gps-eng" gps_prefix = "ENG" compass_color = "#A66300" gpstag = "ENG0" -/obj/item/device/gps/mining +/obj/item/gps/mining icon_state = "gps-min" gps_prefix = "MIN" compass_color = "#5F4519" gpstag = "MIN0" desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life." -/obj/item/device/gps/janitor +/obj/item/gps/janitor icon_state = "gps-jan" gps_prefix = "JAN" compass_color = "#6eaa2c" gpstag = "JAN0" -/obj/item/device/gps/medical +/obj/item/gps/medical icon_state = "gps-med" gps_prefix = "MED" compass_color = "#5EABEB" gpstag = "MED0" -/obj/item/device/gps/marooning_equipment +/obj/item/gps/marooning_equipment icon_state = "gps-mar" gps_prefix = "MAROON" compass_color = "#EAD152" @@ -332,7 +332,7 @@ GLOBAL_LIST_EMPTY(gps_list) /********** Static GPS Start **********/ // Static GPS -/obj/item/device/gps/stationary +/obj/item/gps/stationary name = "static GPS" desc = "A static global positioning system." anchored = TRUE @@ -340,7 +340,7 @@ GLOBAL_LIST_EMPTY(gps_list) layer = BASE_ABOVE_OBJ_LAYER gpstag = "STAT0" -/obj/item/device/gps/stationary/Initialize() +/obj/item/gps/stationary/Initialize() SHOULD_CALL_PARENT(FALSE) if(flags_1 & INITIALIZED_1) @@ -379,11 +379,11 @@ GLOBAL_LIST_EMPTY(gps_list) return INITIALIZE_HINT_NORMAL -/obj/item/device/gps/stationary/attack_hand() // Don't let users pick it up. +/obj/item/gps/stationary/attack_hand() // Don't let users pick it up. return // Spark -/obj/item/device/gps/stationary/mining_shuttle +/obj/item/gps/stationary/mining_shuttle name = "static GPS (SCCV Spark)" desc = "A static global positioning system helpful for finding your way back to the mining shuttle." icon_state = "gps-min" @@ -392,7 +392,7 @@ GLOBAL_LIST_EMPTY(gps_list) gpstag = "SPARK" // Intrepid -/obj/item/device/gps/stationary/sccv_intrepid +/obj/item/gps/stationary/sccv_intrepid name = "static GPS (SCCV Intrepid)" desc = "A static global positioning system helpful for finding your way back to the SCCV Intrepid." icon_state = "gps-com" @@ -400,7 +400,7 @@ GLOBAL_LIST_EMPTY(gps_list) compass_color = "#193A7A" gpstag = "INTREPID" -/obj/item/device/gps/stationary/sccv_canary +/obj/item/gps/stationary/sccv_canary name = "static GPS (SCCV Canary)" desc = "A static global positioning system helpful for finding your way back to the SCCV Canary." icon_state = "gps-com" @@ -408,7 +408,7 @@ GLOBAL_LIST_EMPTY(gps_list) compass_color = "#57c5e0" gpstag = "CANARY" -/obj/item/device/gps/stationary/sccv_quark +/obj/item/gps/stationary/sccv_quark name = "static GPS (SCCV Quark)" desc = "A static global positioning system helpful for finding your way back to the SCCV Quark." icon_state = "gps-sci" diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 8ec4f4c21f2..d17cde9f75d 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -37,7 +37,7 @@ if(panel_open) if(attacking_item.tool_behaviour == TOOL_MULTITOOL) - var/obj/item/device/multitool/M = attacking_item + var/obj/item/multitool/M = attacking_item M.buffer = src to_chat(user, "You save the data in the [attacking_item.name]'s buffer.") else @@ -92,7 +92,7 @@ qdel(src) ///TELEPAD CALLER/// -/obj/item/device/telepad_beacon +/obj/item/telepad_beacon name = "telepad beacon" desc = "Use to warp in a cargo telepad." icon = 'icons/obj/radio.dmi' @@ -101,7 +101,7 @@ origin_tech = list(TECH_BLUESPACE = 3) -/obj/item/device/telepad_beacon/attack_self(mob/user) +/obj/item/telepad_beacon/attack_self(mob/user) if(user) to_chat(user, "Locked In") new /obj/machinery/telepad_cargo(user.loc) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 389cb33add1..4843de3282b 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -70,7 +70,7 @@ var/list/obj/item/bluespace_crystal/crystals = list() ///A GPS that this console contains - var/obj/item/device/gps/inserted_gps + var/obj/item/gps/inserted_gps ///A list of Zlevels that belong to the visitable (generally a ship) we are in var/list/our_zlevels = list() @@ -161,7 +161,7 @@ SPAN_NOTICE("You insert [attacking_item] into \the [src]'s crystal slot.")) updateDialog() - else if(istype(attacking_item, /obj/item/device/gps)) + else if(istype(attacking_item, /obj/item/gps)) if(!inserted_gps) inserted_gps = attacking_item @@ -172,7 +172,7 @@ else if(attacking_item.tool_behaviour == TOOL_MULTITOOL) - var/obj/item/device/multitool/M = attacking_item + var/obj/item/multitool/M = attacking_item if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer M.buffer = null diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 76029e25233..a9726b238b7 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -89,7 +89,7 @@ return /obj/vehicle/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/hand_labeler)) + if(istype(attacking_item, /obj/item/hand_labeler)) return if(attacking_item.tool_behaviour == TOOL_SCREWDRIVER && !organic) if(!locked) diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 182a999c8a1..0d28a84ab2e 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -5,9 +5,9 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list( /// Vent crawling whitelisted items, whoo GLOBAL_LIST_INIT(can_enter_vent_with, list( - /obj/item/device/mmi, + /obj/item/mmi, /obj/item/implant, - /obj/item/device/radio/borg, + /obj/item/radio/borg, /obj/item/holder, /obj/machinery/camera, /mob/living/simple_animal/borer, @@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(can_enter_vent_with, list( /mob/living/proc/vent_trap_check(var/status, var/atom/location) switch (status) if ("departing") - for (var/obj/item/device/assembly/mousetrap/S in location.loc) + for (var/obj/item/assembly/mousetrap/S in location.loc) if (prob(25)) visible_message(SPAN_DANGER("[src] gets caught in the mousetrap while trying to crawl into the vent!"), SPAN_DANGER("You get caught in the mousetrap while trying to crawl into the vent!")) @@ -116,7 +116,7 @@ GLOBAL_LIST_INIT(can_enter_vent_with, list( S.Crossed(src) // Triggers mousetrap forceMove(location.loc) if ("arriving") - for (var/obj/item/device/assembly/mousetrap/S in location.loc) + for (var/obj/item/assembly/mousetrap/S in location.loc) if (prob(75)) S.Crossed(src) // Triggers mousetrap else diff --git a/code/unit_tests/create_and_destroy.dm b/code/unit_tests/create_and_destroy.dm index 56cae2a727d..d430949a832 100644 --- a/code/unit_tests/create_and_destroy.dm +++ b/code/unit_tests/create_and_destroy.dm @@ -25,9 +25,9 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) //Internal organs /obj/item/organ/external, // Requires an organ to init, so would not work here without snowflake code - /obj/item/device/augment_implanter, + /obj/item/augment_implanter, // Wants to be put in hand on creation, so would not work here - /obj/item/device/radiojammer/improvised, + /obj/item/radiojammer/improvised, // Requires a path of some sort to init /obj/item/storage/bag/stockparts_box/telecomms, // Paint fails on init, probably not because of us, whoever wrote the chemistry of it have probably also eat the leaded one diff --git a/config/example/custom_items.json b/config/example/custom_items.json index 44e0428ed74..8184d32b8f6 100644 --- a/config/example/custom_items.json +++ b/config/example/custom_items.json @@ -1,30 +1,35 @@ [ - { - "ckey": "arrow768", - "character_name": "Jane Doe", - "item_path": "/obj/item/toy/plushie", - "item_data": {"name":"ugly plush toy","desc":"It's truly hideous."}, - "req_titles": ["Assistant", "Security Officer"] - }, - { - "ckey": "arrow768", - "character_name": "Jane Doe", - "item_path": "/obj/item/device/kit/paint", - "item_data": {"name":"APLU customisation kit","desc":"It's truly hideous."}, - "additional_data": "ripley, firefighter" - }, - { - "ckey": "arrow768", - "character_name": "Jane Doe", - "item_path": "/obj/item/device/kit/suit", - "item_data": {"name":"salvage suit customisation kit","desc":"A customisation kit with all the parts needed to convert a suit."} - }, - { - "ckey": "arrow768", - "character_name": "John Doe", - "item_path": "/obj/item/gun/energy/lawgiver", - "item_name":"Executioner", - "item_desc":"When you really need to motivate your crew." - } + { + "ckey": "arrow768", + "character_name": "Jane Doe", + "item_path": "/obj/item/toy/plushie", + "item_data": { "name": "ugly plush toy", "desc": "It's truly hideous." }, + "req_titles": ["Assistant", "Security Officer"] + }, + { + "ckey": "arrow768", + "character_name": "Jane Doe", + "item_path": "/obj/item/kit/paint", + "item_data": { + "name": "APLU customisation kit", + "desc": "It's truly hideous." + }, + "additional_data": "ripley, firefighter" + }, + { + "ckey": "arrow768", + "character_name": "Jane Doe", + "item_path": "/obj/item/kit/suit", + "item_data": { + "name": "salvage suit customisation kit", + "desc": "A customisation kit with all the parts needed to convert a suit." + } + }, + { + "ckey": "arrow768", + "character_name": "John Doe", + "item_path": "/obj/item/gun/energy/lawgiver", + "item_name": "Executioner", + "item_desc": "When you really need to motivate your crew." + } ] - diff --git a/html/changelogs/GeneralCamo - Device Kill.yml b/html/changelogs/GeneralCamo - Device Kill.yml new file mode 100644 index 00000000000..bcab8a6c43a --- /dev/null +++ b/html/changelogs/GeneralCamo - Device Kill.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - code_imp: "Refactored away /item/device/" diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml index dbe01454ee2..0f0036353ba 100644 --- a/html/changelogs/archive/2023-09.yml +++ b/html/changelogs/archive/2023-09.yml @@ -135,7 +135,7 @@ FluffyGhost: - bugfix: /datum/action and /obj/screen/movable/action_button now drops their references on QDEL. - - bugfix: /obj/item/device/uplink now drops the reference to the owner on qdel. + - bugfix: /obj/item/uplink now drops the reference to the owner on qdel. - bugfix: /obj/item/implant now drops the reference to the organ (part) on qdel. - bugfix: /obj/screen/ability now returns the QDEL hint correctly. GeneralCamo: diff --git a/icons/obj/item/device/advanced_healthanalyzer.dmi b/icons/obj/item/advanced_healthanalyzer.dmi similarity index 100% rename from icons/obj/item/device/advanced_healthanalyzer.dmi rename to icons/obj/item/advanced_healthanalyzer.dmi diff --git a/icons/obj/item/device/air_analyzer.dmi b/icons/obj/item/air_analyzer.dmi similarity index 100% rename from icons/obj/item/device/air_analyzer.dmi rename to icons/obj/item/air_analyzer.dmi diff --git a/icons/obj/item/device/batterer.dmi b/icons/obj/item/batterer.dmi similarity index 100% rename from icons/obj/item/device/batterer.dmi rename to icons/obj/item/batterer.dmi diff --git a/icons/obj/item/device/binoculars.dmi b/icons/obj/item/binoculars.dmi similarity index 100% rename from icons/obj/item/device/binoculars.dmi rename to icons/obj/item/binoculars.dmi diff --git a/icons/obj/item/device/breath_analyzer.dmi b/icons/obj/item/breath_analyzer.dmi similarity index 100% rename from icons/obj/item/device/breath_analyzer.dmi rename to icons/obj/item/breath_analyzer.dmi diff --git a/icons/obj/item/device/chameleon.dmi b/icons/obj/item/chameleon.dmi similarity index 100% rename from icons/obj/item/device/chameleon.dmi rename to icons/obj/item/chameleon.dmi diff --git a/icons/obj/item/device/cratescanner.dmi b/icons/obj/item/cratescanner.dmi similarity index 100% rename from icons/obj/item/device/cratescanner.dmi rename to icons/obj/item/cratescanner.dmi diff --git a/icons/obj/item/device/dest_tagger.dmi b/icons/obj/item/dest_tagger.dmi similarity index 100% rename from icons/obj/item/device/dest_tagger.dmi rename to icons/obj/item/dest_tagger.dmi diff --git a/icons/obj/item/device/eftpos.dmi b/icons/obj/item/eftpos.dmi similarity index 100% rename from icons/obj/item/device/eftpos.dmi rename to icons/obj/item/eftpos.dmi diff --git a/icons/obj/item/device/encryptionkey.dmi b/icons/obj/item/encryptionkey.dmi similarity index 100% rename from icons/obj/item/device/encryptionkey.dmi rename to icons/obj/item/encryptionkey.dmi diff --git a/icons/obj/item/device/export_scanner.dmi b/icons/obj/item/export_scanner.dmi similarity index 100% rename from icons/obj/item/device/export_scanner.dmi rename to icons/obj/item/export_scanner.dmi diff --git a/icons/obj/item/device/flash.dmi b/icons/obj/item/flash.dmi similarity index 100% rename from icons/obj/item/device/flash.dmi rename to icons/obj/item/flash.dmi diff --git a/icons/obj/item/device/gps.dmi b/icons/obj/item/gps.dmi similarity index 100% rename from icons/obj/item/device/gps.dmi rename to icons/obj/item/gps.dmi diff --git a/icons/obj/item/device/hailer.dmi b/icons/obj/item/hailer.dmi similarity index 100% rename from icons/obj/item/device/hailer.dmi rename to icons/obj/item/hailer.dmi diff --git a/icons/obj/item/device/healthanalyzer.dmi b/icons/obj/item/healthanalyzer.dmi similarity index 100% rename from icons/obj/item/device/healthanalyzer.dmi rename to icons/obj/item/healthanalyzer.dmi diff --git a/icons/obj/item/device/hearing_aid.dmi b/icons/obj/item/hearing_aid.dmi similarity index 100% rename from icons/obj/item/device/hearing_aid.dmi rename to icons/obj/item/hearing_aid.dmi diff --git a/icons/obj/item/device/kinetic_analyzer.dmi b/icons/obj/item/kinetic_analyzer.dmi similarity index 100% rename from icons/obj/item/device/kinetic_analyzer.dmi rename to icons/obj/item/kinetic_analyzer.dmi diff --git a/icons/obj/item/device/laser_pointer.dmi b/icons/obj/item/laser_pointer.dmi similarity index 100% rename from icons/obj/item/device/laser_pointer.dmi rename to icons/obj/item/laser_pointer.dmi diff --git a/icons/obj/item/device/mass_spectrometer.dmi b/icons/obj/item/mass_spectrometer.dmi similarity index 100% rename from icons/obj/item/device/mass_spectrometer.dmi rename to icons/obj/item/mass_spectrometer.dmi diff --git a/icons/obj/item/device/megaphone.dmi b/icons/obj/item/megaphone.dmi similarity index 100% rename from icons/obj/item/device/megaphone.dmi rename to icons/obj/item/megaphone.dmi diff --git a/icons/obj/item/device/modkit.dmi b/icons/obj/item/modkit.dmi similarity index 100% rename from icons/obj/item/device/modkit.dmi rename to icons/obj/item/modkit.dmi diff --git a/icons/obj/item/device/multitool.dmi b/icons/obj/item/multitool.dmi similarity index 100% rename from icons/obj/item/device/multitool.dmi rename to icons/obj/item/multitool.dmi diff --git a/icons/obj/item/device/oxycandle.dmi b/icons/obj/item/oxycandle.dmi similarity index 100% rename from icons/obj/item/device/oxycandle.dmi rename to icons/obj/item/oxycandle.dmi diff --git a/icons/obj/item/device/paint_sprayer.dmi b/icons/obj/item/paint_sprayer.dmi similarity index 100% rename from icons/obj/item/device/paint_sprayer.dmi rename to icons/obj/item/paint_sprayer.dmi diff --git a/icons/obj/item/device/pin_extractor.dmi b/icons/obj/item/pin_extractor.dmi similarity index 100% rename from icons/obj/item/device/pin_extractor.dmi rename to icons/obj/item/pin_extractor.dmi diff --git a/icons/obj/item/device/pipe_painter.dmi b/icons/obj/item/pipe_painter.dmi similarity index 100% rename from icons/obj/item/device/pipe_painter.dmi rename to icons/obj/item/pipe_painter.dmi diff --git a/icons/obj/item/device/plant_analyzer.dmi b/icons/obj/item/plant_analyzer.dmi similarity index 100% rename from icons/obj/item/device/plant_analyzer.dmi rename to icons/obj/item/plant_analyzer.dmi diff --git a/icons/obj/item/device/powersink.dmi b/icons/obj/item/powersink.dmi similarity index 100% rename from icons/obj/item/device/powersink.dmi rename to icons/obj/item/powersink.dmi diff --git a/icons/obj/item/device/price_scanner.dmi b/icons/obj/item/price_scanner.dmi similarity index 100% rename from icons/obj/item/device/price_scanner.dmi rename to icons/obj/item/price_scanner.dmi diff --git a/icons/obj/item/device/radio/headset.dmi b/icons/obj/item/radio/headset.dmi similarity index 100% rename from icons/obj/item/device/radio/headset.dmi rename to icons/obj/item/radio/headset.dmi diff --git a/icons/obj/item/device/radio/headset_alt.dmi b/icons/obj/item/radio/headset_alt.dmi similarity index 100% rename from icons/obj/item/device/radio/headset_alt.dmi rename to icons/obj/item/radio/headset_alt.dmi diff --git a/icons/obj/item/device/radio/headset_alt_double.dmi b/icons/obj/item/radio/headset_alt_double.dmi similarity index 100% rename from icons/obj/item/device/radio/headset_alt_double.dmi rename to icons/obj/item/radio/headset_alt_double.dmi diff --git a/icons/obj/item/device/radio/headset_clip.dmi b/icons/obj/item/radio/headset_clip.dmi similarity index 100% rename from icons/obj/item/device/radio/headset_clip.dmi rename to icons/obj/item/radio/headset_clip.dmi diff --git a/icons/obj/item/device/radio/headset_wrist.dmi b/icons/obj/item/radio/headset_wrist.dmi similarity index 100% rename from icons/obj/item/device/radio/headset_wrist.dmi rename to icons/obj/item/radio/headset_wrist.dmi diff --git a/icons/obj/item/device/reagent_scanner.dmi b/icons/obj/item/reagent_scanner.dmi similarity index 100% rename from icons/obj/item/device/reagent_scanner.dmi rename to icons/obj/item/reagent_scanner.dmi diff --git a/icons/obj/item/device/robotanalyzer.dmi b/icons/obj/item/robotanalyzer.dmi similarity index 100% rename from icons/obj/item/device/robotanalyzer.dmi rename to icons/obj/item/robotanalyzer.dmi diff --git a/icons/obj/item/device/slime_scanner.dmi b/icons/obj/item/slime_scanner.dmi similarity index 100% rename from icons/obj/item/device/slime_scanner.dmi rename to icons/obj/item/slime_scanner.dmi diff --git a/icons/obj/item/device/suitcooler.dmi b/icons/obj/item/suitcooler.dmi similarity index 100% rename from icons/obj/item/device/suitcooler.dmi rename to icons/obj/item/suitcooler.dmi diff --git a/icons/obj/item/device/suitrecord.dmi b/icons/obj/item/suitrecord.dmi similarity index 100% rename from icons/obj/item/device/suitrecord.dmi rename to icons/obj/item/suitrecord.dmi diff --git a/icons/obj/item/device/t_scanner.dmi b/icons/obj/item/t_scanner.dmi similarity index 100% rename from icons/obj/item/device/t_scanner.dmi rename to icons/obj/item/t_scanner.dmi diff --git a/icons/obj/item/device/taperecorder.dmi b/icons/obj/item/taperecorder.dmi similarity index 100% rename from icons/obj/item/device/taperecorder.dmi rename to icons/obj/item/taperecorder.dmi diff --git a/icons/obj/item/device/toner.dmi b/icons/obj/item/toner.dmi similarity index 100% rename from icons/obj/item/device/toner.dmi rename to icons/obj/item/toner.dmi diff --git a/icons/obj/item/device/tvcamera.dmi b/icons/obj/item/tvcamera.dmi similarity index 100% rename from icons/obj/item/device/tvcamera.dmi rename to icons/obj/item/tvcamera.dmi diff --git a/icons/obj/item/device/uv_light.dmi b/icons/obj/item/uv_light.dmi similarity index 100% rename from icons/obj/item/device/uv_light.dmi rename to icons/obj/item/uv_light.dmi diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm index d6057deff04..a5f190a8b1c 100644 --- a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm +++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm @@ -1110,7 +1110,7 @@ /obj/item/storage/box/lights/mixed{ pixel_y = 4 }, -/obj/item/device/lightreplacer{ +/obj/item/lightreplacer{ pixel_y = 6 }, /turf/simulated/floor/tiled/dark, @@ -1450,7 +1450,7 @@ /obj/random/dirt_75, /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, /obj/structure/closet/walllocker/emerglocker/east, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/storage/bag/inflatable/emergency, /turf/simulated/floor/tiled, /area/abandoned_diner/docking/b) @@ -1695,7 +1695,7 @@ /area/abandoned_diner/maintenance) "aEQ" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 12; pixel_x = -4 }, @@ -3549,7 +3549,7 @@ /obj/structure/bed/stool/chair/folding{ dir = 8 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = -18; pixel_x = -11 }, @@ -5343,10 +5343,10 @@ }, /obj/structure/closet/crate, /obj/machinery/power/apc/west, -/obj/item/device/vending_refill/snack, -/obj/item/device/vending_refill/cola, -/obj/item/device/vending_refill/smokes, -/obj/item/device/vending_refill/seeds, +/obj/item/vending_refill/snack, +/obj/item/vending_refill/cola, +/obj/item/vending_refill/smokes, +/obj/item/vending_refill/seeds, /obj/random/loot, /obj/random/loot, /obj/random/loot, diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm index 1726f42245b..798435298c4 100644 --- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm +++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm @@ -1157,7 +1157,7 @@ /area/abandoned_industrial_station/bridge) "dI" = ( /obj/structure/table/standard, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280; pixel_y = 11 }, @@ -1441,7 +1441,7 @@ /area/abandoned_industrial_station/maint_a2) "eA" = ( /obj/structure/table/standard, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = 6 }, /turf/simulated/floor/tiled, @@ -2146,7 +2146,7 @@ /turf/simulated/floor/tiled, /area/abandoned_industrial_station/hangar) "gY" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 9; pixel_y = 4 }, @@ -2306,7 +2306,7 @@ /turf/simulated/floor/airless, /area/abandoned_industrial_station/atmos) "hv" = ( -/obj/item/device/flashlight/marshallingwand{ +/obj/item/flashlight/marshallingwand{ pixel_y = -11 }, /obj/random/dirt_75, @@ -2445,7 +2445,7 @@ "hV" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/dirt_75, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = -12 }, @@ -3287,7 +3287,7 @@ /turf/simulated/floor/tiled, /area/abandoned_industrial_station/hangar) "kx" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/random/dirt_75, /turf/simulated/floor/plating, /area/abandoned_industrial_station/engineering) @@ -3790,7 +3790,7 @@ "mq" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/random/dirt_75, @@ -3976,7 +3976,7 @@ }, /area/abandoned_industrial_station/engineering) "mS" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -4; pixel_y = -6 }, @@ -4583,7 +4583,7 @@ /area/abandoned_industrial_station/service) "oN" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = -12 }, @@ -5203,7 +5203,7 @@ /turf/simulated/floor/reinforced/airless, /area/abandoned_industrial_station/atmos) "qF" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -1; pixel_y = -6 }, @@ -5937,7 +5937,7 @@ }, /obj/structure/closet/crate, /obj/machinery/light/colored/dying, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/tiled, /area/abandoned_industrial_station/bridge) "sU" = ( @@ -6371,7 +6371,7 @@ /obj/structure/table/standard{ no_cargo = 1 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -9; pixel_y = 5 }, @@ -6539,7 +6539,7 @@ /turf/simulated/floor/tiled/full, /area/abandoned_industrial_station/hallways) "uS" = ( -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -2; pixel_y = 3 }, @@ -6977,7 +6977,7 @@ /obj/effect/floor_decal/corner/green{ dir = 6 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -2; pixel_y = 3 }, @@ -7220,7 +7220,7 @@ req_one_access = null }, /obj/item/storage/box/lights/mixed, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled, /area/abandoned_industrial_station/docks_east) "wZ" = ( @@ -9569,7 +9569,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 1 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -2; pixel_y = -11 }, @@ -9641,7 +9641,7 @@ /obj/structure/table/glass{ table_reinf = "glass" }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -3; pixel_y = 4 }, @@ -9786,7 +9786,7 @@ /area/abandoned_industrial_station/engineering) "EH" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/pink{ +/obj/item/flashlight/lamp/lava/pink{ pixel_x = 4; pixel_y = 5 }, @@ -10137,7 +10137,7 @@ "FL" = ( /obj/structure/table/standard, /obj/random/dirt_75, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = -3 }, @@ -13587,7 +13587,7 @@ /obj/effect/floor_decal/corner/beige{ dir = 5 }, -/obj/item/device/flashlight/empty{ +/obj/item/flashlight/empty{ pixel_x = 6; pixel_y = 4 }, @@ -14197,7 +14197,7 @@ dir = 1 }, /obj/random/dirt_75, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 1; pixel_y = 7 }, @@ -14348,7 +14348,7 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -4; pixel_y = 6 }, @@ -14934,7 +14934,7 @@ dir = 1 }, /obj/random/dirt_75, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = -12 }, @@ -15130,7 +15130,7 @@ /area/abandoned_industrial_station/atmos) "VZ" = ( /obj/effect/floor_decal/corner/yellow/diagonal, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 3; pixel_y = 12 }, @@ -15183,7 +15183,7 @@ /turf/simulated/floor/plating, /area/abandoned_industrial_station/maint_central) "Wg" = ( -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 10; pixel_y = 6 }, @@ -15608,7 +15608,7 @@ /area/abandoned_industrial_station/docks_east) "XE" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 4 }, @@ -15672,11 +15672,11 @@ /area/abandoned_industrial_station/service) "XO" = ( /obj/structure/table/standard, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 5; pixel_y = -14 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -6; pixel_y = 1 }, @@ -15966,7 +15966,7 @@ /turf/simulated/floor/tiled, /area/abandoned_industrial_station/hangar) "YD" = ( -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = 8 }, /turf/simulated/floor/tiled, @@ -16020,7 +16020,7 @@ pixel_x = 10; pixel_y = 3 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = -6 }, /obj/random/dirt_75, @@ -16240,7 +16240,7 @@ pixel_x = -5; pixel_y = 2 }, -/obj/item/device/assembly/mousetrap/armed{ +/obj/item/assembly/mousetrap/armed{ pixel_x = 6; pixel_y = 2 }, diff --git a/maps/away/away_site/abandoned_mining/cursed.dmm b/maps/away/away_site/abandoned_mining/cursed.dmm index 8adc1757f4f..40dbd72b6d8 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dmm +++ b/maps/away/away_site/abandoned_mining/cursed.dmm @@ -56,7 +56,7 @@ /area/cursed/mineral_processing) "atI" = ( /obj/structure/table/wood, -/obj/item/device/versebook/gadpathur{ +/obj/item/versebook/gadpathur{ pixel_y = 2 }, /turf/simulated/floor/wood, @@ -230,7 +230,7 @@ /turf/simulated/floor, /area/cursed/hangar) "beQ" = ( -/obj/item/device/mmi/digital/posibrain, +/obj/item/mmi/digital/posibrain, /obj/machinery/constructable_frame/temp_deco, /obj/item/stack/material/plasteel/full, /obj/item/circuitboard/aicore, @@ -547,8 +547,8 @@ /turf/simulated/floor/tiled/yellow, /area/cursed/hangar) "cVh" = ( -/obj/item/device/binoculars/high_power, -/obj/item/device/radio{ +/obj/item/binoculars/high_power, +/obj/item/radio{ icon_state = "radio"; pixel_x = -1; pixel_y = 16 @@ -2149,7 +2149,7 @@ /turf/simulated/floor/reinforced/airless, /area/cursed/eva_storage) "mQc" = ( -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine{ pixel_x = 9; @@ -2872,7 +2872,7 @@ /area/cursed/storage) "qFB" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 12; pixel_x = -3 }, @@ -3179,7 +3179,7 @@ /area/cursed/mineral_processing) "rSt" = ( /obj/structure/table/wood, -/obj/item/device/camera, +/obj/item/camera, /obj/machinery/chemical_dispenser/coffee{ pixel_y = 17; pixel_x = -26 @@ -3565,7 +3565,7 @@ "uwc" = ( /obj/machinery/cell_charger, /obj/structure/table/steel, -/obj/item/device/orbital_dropper/drill, +/obj/item/orbital_dropper/drill, /turf/simulated/floor/tiled/yellow, /area/cursed/storage) "uwQ" = ( @@ -3920,7 +3920,7 @@ /area/cursed/medical) "wDZ" = ( /obj/structure/bookcase, -/obj/item/device/versebook/dpra, +/obj/item/versebook/dpra, /turf/simulated/floor/wood, /area/cursed/living_area) "wHA" = ( diff --git a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm index 993e2f828f8..eebde715058 100644 --- a/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm +++ b/maps/away/away_site/abandoned_propellant_depot/abandoned_propellant_depot.dmm @@ -443,7 +443,7 @@ /area/abandoned_propellant_depot/docks_north_east) "bo" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4; pixel_x = -5 }, @@ -555,7 +555,7 @@ /area/abandoned_propellant_depot/atmos_propellant) "bH" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_y = -10; pixel_x = -2 }, @@ -1373,7 +1373,7 @@ /obj/random/tool, /obj/random/tool, /obj/random/tool, -/obj/item/device/flashlight/flare/glowstick/random, +/obj/item/flashlight/flare/glowstick/random, /obj/random/dirt_75, /obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, @@ -1775,7 +1775,7 @@ /turf/simulated/floor/plating, /area/abandoned_propellant_depot/docks_north_east) "fs" = ( -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7; pixel_x = 11 }, @@ -2134,7 +2134,7 @@ /obj/item/storage/box/lights/mixed, /obj/item/reagent_containers/glass/bucket, /obj/item/clothing/gloves/janitor, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/tiled, @@ -2196,7 +2196,7 @@ pixel_x = 3; pixel_y = 5 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -3; pixel_y = 7 }, @@ -3711,7 +3711,7 @@ /obj/structure/table/glass{ table_reinf = "glass" }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -3; pixel_y = 4 }, @@ -4017,7 +4017,7 @@ /area/abandoned_propellant_depot/atmos_air) "nn" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 3; on = 0 @@ -4412,7 +4412,7 @@ /area/abandoned_propellant_depot/crew_quarters) "oE" = ( /obj/structure/table/steel, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7 }, /obj/random/dirt_75, @@ -4482,7 +4482,7 @@ /obj/structure/closet, /obj/random/tool, /obj/random/tool, -/obj/item/device/flashlight/flare/glowstick/random, +/obj/item/flashlight/flare/glowstick/random, /obj/random/tool, /obj/random/dirt_75, /obj/random/dirt_75, @@ -4604,7 +4604,7 @@ /area/abandoned_propellant_depot/eva) "pl" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 4 }, @@ -4852,7 +4852,7 @@ pixel_x = -4; pixel_y = -8 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 4 }, @@ -5025,7 +5025,7 @@ /area/abandoned_propellant_depot/maint) "qJ" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -2; pixel_y = 4 }, @@ -5301,7 +5301,7 @@ /turf/simulated/floor/tiled, /area/abandoned_propellant_depot/atmos_air) "rN" = ( -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7; pixel_x = 11 }, @@ -6564,8 +6564,8 @@ /area/abandoned_propellant_depot/engineering) "vQ" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight, -/obj/item/device/flashlight/flare/glowstick, +/obj/item/flashlight, +/obj/item/flashlight/flare/glowstick, /obj/random/dirt_75, /obj/machinery/light/colored/dying{ dir = 8 @@ -7613,7 +7613,7 @@ /obj/structure/closet/crate, /obj/random/tool, /obj/random/tool, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tool, @@ -7743,7 +7743,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/structure/lattice/catwalk/indoor/grate, @@ -7913,7 +7913,7 @@ /area/abandoned_propellant_depot/hallways_west) "Ai" = ( /obj/structure/table/steel, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280; pixel_y = 11 }, @@ -8821,7 +8821,7 @@ /area/abandoned_propellant_depot/hallways_south) "Di" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/machinery/alarm/east, @@ -10732,7 +10732,7 @@ /turf/simulated/floor/plating, /area/abandoned_propellant_depot/docks_south_west) "Jq" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/machinery/portable_atmospherics/powered/pump, @@ -10772,7 +10772,7 @@ /turf/simulated/floor/tiled, /area/abandoned_propellant_depot/engineering) "Jw" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /turf/simulated/floor/tiled/full, @@ -11292,11 +11292,11 @@ /area/abandoned_propellant_depot/docks_north_east) "Lg" = ( /obj/structure/closet, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -8 }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight{ pixel_y = 8 }, /obj/random/dirt_75, @@ -12207,14 +12207,14 @@ /obj/item/clothing/gloves/latex, /obj/item/clothing/head/nursehat, /obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/device/healthanalyzer, -/obj/item/device/breath_analyzer, +/obj/item/healthanalyzer, +/obj/item/breath_analyzer, /obj/random/dirt_75, /turf/simulated/floor/tiled/white, /area/abandoned_propellant_depot/medbay) "Oh" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_x = -8; pixel_y = 1 }, @@ -13321,7 +13321,7 @@ /turf/simulated/floor/tiled/white, /area/abandoned_propellant_depot/kitchen) "RH" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/random/dirt_75, @@ -13524,7 +13524,7 @@ /turf/simulated/floor/plating, /area/abandoned_propellant_depot/atmos_air_aux_fill) "SE" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/random/dirt_75, @@ -13851,7 +13851,7 @@ /turf/simulated/floor/tiled, /area/abandoned_propellant_depot/security) "Tz" = ( -/obj/item/device/flashlight/survival{ +/obj/item/flashlight/survival{ pixel_x = 10; pixel_y = 6 }, @@ -14423,7 +14423,7 @@ /area/abandoned_propellant_depot/hallways_west) "Vo" = ( /obj/structure/lattice/catwalk, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7; pixel_x = -4 }, @@ -15629,7 +15629,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/effect/floor_decal/industrial/warning, diff --git a/maps/away/away_site/blueriver/blueriver.dmm b/maps/away/away_site/blueriver/blueriver.dmm index 8498f9df304..6595e8297fa 100644 --- a/maps/away/away_site/blueriver/blueriver.dmm +++ b/maps/away/away_site/blueriver/blueriver.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "as" = ( -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/away/blueriver/alienfloor{ light_range = 5 }, @@ -59,7 +59,7 @@ /area/bluespaceriver/ship) "dH" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/barren{ temperature = 250 }, @@ -336,7 +336,7 @@ /area/bluespaceriver/underground) "rF" = ( /obj/item/gun/energy/plasmacutter, -/obj/item/device/depth_scanner, +/obj/item/depth_scanner, /turf/simulated/floor/exoplanet/barren{ temperature = 250 }, @@ -407,7 +407,7 @@ /area/bluespaceriver/ship) "uw" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/device/ano_scanner, +/obj/item/ano_scanner, /turf/simulated/floor/tiled/white, /area/bluespaceriver/ship) "uM" = ( @@ -445,7 +445,7 @@ /turf/simulated/floor/tiled/white, /area/bluespaceriver/ship) "vV" = ( -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ fuel = 100000 }, /turf/simulated/floor/away/blueriver/alienfloor{ @@ -569,7 +569,7 @@ }, /area/bluespaceriver/underground) "AQ" = ( -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/exoplanet/barren{ temperature = 250 }, @@ -1117,7 +1117,7 @@ }, /area/bluespaceriver/underground) "YP" = ( -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/simulated/floor/away/blueriver/alienfloor{ light_range = 5 }, diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm index 0211a28c490..a7228802ef2 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm @@ -22,7 +22,7 @@ /obj/item/reagent_containers/food/drinks/waterbottle{ pixel_x = 5 }, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280; pixel_x = -4; pixel_y = -16 @@ -471,7 +471,7 @@ /turf/simulated/floor/reinforced/airless, /area/crashed_elyran_tanker/engineering) "ea" = ( -/obj/item/device/pipe_painter{ +/obj/item/pipe_painter{ pixel_x = -4 }, /obj/effect/decal/cleanable/dirt, @@ -1088,7 +1088,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 5 }, /turf/simulated/floor/tiled, @@ -1171,7 +1171,7 @@ /obj/item/pipe{ pixel_y = -3 }, -/obj/item/device/transfer_valve{ +/obj/item/transfer_valve{ pixel_x = -10; pixel_y = 2 }, @@ -1310,7 +1310,7 @@ "nw" = ( /obj/structure/table/standard, /obj/effect/decal/cleanable/dirt, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280; pixel_y = 11 }, @@ -1594,7 +1594,7 @@ /area/crashed_elyran_tanker/bridge) "qn" = ( /obj/structure/table/steel, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280 }, /turf/simulated/floor/airless, @@ -2032,7 +2032,7 @@ /turf/simulated/floor, /area/crashed_elyran_tanker/crew) "vu" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 5; pixel_x = -12 }, @@ -2678,7 +2678,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/pipe_painter{ +/obj/item/pipe_painter{ pixel_x = 4; pixel_y = -6 }, @@ -2722,7 +2722,7 @@ /area/crashed_elyran_tanker/engineering) "Bw" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = -8 }, @@ -4798,7 +4798,7 @@ /obj/structure/toilet{ pixel_y = 8 }, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280; pixel_y = -8; pixel_x = 9 diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm index e6e6c379243..f1c581ed258 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm @@ -819,7 +819,7 @@ /turf/simulated/floor/tiled/white, /area/crystal_planet_outpost/living) "kP" = ( -/obj/item/device/versebook/biesel{ +/obj/item/versebook/biesel{ pixel_x = -3; pixel_y = 4 }, @@ -1027,7 +1027,7 @@ "nK" = ( /obj/effect/floor_decal/corner_wide/pink/diagonal, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 7 }, /turf/simulated/floor/tiled, @@ -2082,11 +2082,11 @@ "DG" = ( /obj/item/storage/belt/archaeology, /obj/item/storage/box/unique/excavation, -/obj/item/device/flashlight/lantern, -/obj/item/device/ano_scanner, -/obj/item/device/depth_scanner, -/obj/item/device/core_sampler, -/obj/item/device/measuring_tape, +/obj/item/flashlight/lantern, +/obj/item/ano_scanner, +/obj/item/depth_scanner, +/obj/item/core_sampler, +/obj/item/measuring_tape, /obj/item/pickaxe/hand, /obj/item/storage/bag/fossils, /obj/item/stack/flag/green, @@ -2702,7 +2702,7 @@ /turf/simulated/floor/tiled, /area/crystal_planet_outpost/engineering) "Ml" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 6; on = 0 }, @@ -2842,7 +2842,7 @@ /area/crystal_planet_outpost/caves) "Ob" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = 5; pixel_y = 5 }, @@ -3232,7 +3232,7 @@ "SS" = ( /obj/effect/floor_decal/corner_wide/pink/diagonal, /obj/structure/table/standard, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -4; pixel_y = 5 }, diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm index a589d35f36d..6712684bde4 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm @@ -598,7 +598,7 @@ "ua" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/table/steel, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -4; pixel_y = 5 }, @@ -820,11 +820,11 @@ /obj/random/dirt_75, /obj/item/storage/belt/archaeology, /obj/item/storage/box/unique/excavation, -/obj/item/device/flashlight/lantern, -/obj/item/device/ano_scanner, -/obj/item/device/depth_scanner, -/obj/item/device/core_sampler, -/obj/item/device/measuring_tape, +/obj/item/flashlight/lantern, +/obj/item/ano_scanner, +/obj/item/depth_scanner, +/obj/item/core_sampler, +/obj/item/measuring_tape, /obj/item/pickaxe/hand, /obj/item/storage/bag/fossils, /obj/item/stack/flag/green, @@ -1084,11 +1084,11 @@ "GP" = ( /obj/item/storage/belt/archaeology, /obj/item/storage/box/unique/excavation, -/obj/item/device/flashlight/lantern, -/obj/item/device/ano_scanner, -/obj/item/device/depth_scanner, -/obj/item/device/core_sampler, -/obj/item/device/measuring_tape, +/obj/item/flashlight/lantern, +/obj/item/ano_scanner, +/obj/item/depth_scanner, +/obj/item/core_sampler, +/obj/item/measuring_tape, /obj/item/pickaxe/hand, /obj/item/storage/bag/fossils, /obj/item/stack/flag/green, @@ -1332,7 +1332,7 @@ /area/template_noop) "OI" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 4; pixel_y = 11 }, diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm index 36c6666dbda..c8bded727a1 100644 --- a/maps/away/away_site/cult_base/cult_base.dmm +++ b/maps/away/away_site/cult_base/cult_base.dmm @@ -611,7 +611,7 @@ pixel_y = 5; pixel_x = 6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -9; pixel_x = -3 }, @@ -1631,7 +1631,7 @@ /turf/simulated/floor/plating, /area/cult_base/engineering) "aeR" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/structure/cable{ @@ -3803,7 +3803,7 @@ /area/cult_base/atmos_supply) "arD" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 5; pixel_y = 5 }, @@ -5466,11 +5466,11 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3; pixel_y = 3 }, -/obj/item/device/radio/intercom/hailing/north, +/obj/item/radio/intercom/hailing/north, /turf/simulated/floor/tiled/dark, /area/shuttle/cult_base/crew) "aBH" = ( @@ -5791,7 +5791,7 @@ /area/cult_base/atmos_waste) "aEo" = ( /obj/random/dirt_75, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = 3 }, @@ -5919,7 +5919,7 @@ pixel_y = 4; pixel_x = -3 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = 6; pixel_y = -8 }, @@ -7314,7 +7314,7 @@ pixel_y = 5; pixel_x = 4 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -3; pixel_y = 6 }, @@ -7890,7 +7890,7 @@ "aRf" = ( /obj/structure/table/steel, /obj/machinery/light/broken, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 6 }, /turf/simulated/floor/tiled/dark, @@ -8431,7 +8431,7 @@ /area/cult_base/crew_quarters) "aTL" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/radio/intercom/hailing/north, +/obj/item/radio/intercom/hailing/north, /turf/simulated/floor/tiled/dark/full, /area/cult_base/bridge) "aTO" = ( @@ -8442,7 +8442,7 @@ /area/shuttle/cult_base/cargo) "aTT" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -4; pixel_y = 5 }, @@ -10003,7 +10003,7 @@ /obj/effect/floor_decal/industrial/arrow/yellow{ dir = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = 3 }, @@ -10392,7 +10392,7 @@ pixel_y = 6; pixel_x = 5 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -7; pixel_x = -5 }, @@ -10411,7 +10411,7 @@ pixel_y = 6; pixel_x = 3 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -10; pixel_x = -4 }, @@ -10639,7 +10639,7 @@ pixel_y = 5; pixel_x = 6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -6; pixel_x = -8 }, @@ -11087,7 +11087,7 @@ "llr" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = 3 }, @@ -11859,7 +11859,7 @@ /area/cult_base/docks_south) "qpW" = ( /obj/random/dirt_75, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -7; pixel_x = -5 }, @@ -11880,7 +11880,7 @@ /obj/effect/floor_decal/industrial/arrow/yellow{ dir = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -7; pixel_x = -5 }, @@ -11905,7 +11905,7 @@ "qKL" = ( /obj/random/dirt_75, /obj/effect/floor_decal/industrial/arrow/yellow, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = 3 }, @@ -12183,7 +12183,7 @@ /area/cult_base/docks_west) "svP" = ( /obj/random/dirt_75, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -7; pixel_x = -5 }, @@ -12329,7 +12329,7 @@ pixel_y = 10; pixel_x = -3 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = 3 }, @@ -12599,7 +12599,7 @@ /area/shuttle/cult_base/crew) "uQf" = ( /obj/random/dirt_75, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = 3 }, @@ -12817,7 +12817,7 @@ "wtJ" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -7; pixel_x = -5 }, diff --git a/maps/away/away_site/cult_base/cult_base_ghostroles.dm b/maps/away/away_site/cult_base/cult_base_ghostroles.dm index 30ba8c787cc..be8f0fe402a 100644 --- a/maps/away/away_site/cult_base/cult_base_ghostroles.dm +++ b/maps/away/away_site/cult_base/cult_base_ghostroles.dm @@ -165,10 +165,10 @@ /obj/item/storage/backpack/cultpack, ) r_hand = list( - /obj/item/device/flashlight/on, - /obj/item/device/flashlight/lantern/on, - /obj/item/device/flashlight/maglight/on, - /obj/item/device/flashlight/heavy/on, + /obj/item/flashlight/on, + /obj/item/flashlight/lantern/on, + /obj/item/flashlight/maglight/on, + /obj/item/flashlight/heavy/on, ) l_hand = list( /obj/item/melee/cultblade, @@ -183,7 +183,7 @@ ) backpack_contents = list( /obj/item/storage/box/survival = 1, - /obj/item/device/flashlight/flare/glowstick/random = 1, + /obj/item/flashlight/flare/glowstick/random = 1, /obj/random/junk = 1, /obj/item/material/knife/ritual = 1, ) diff --git a/maps/away/away_site/first_aurora/first_aurora.dmm b/maps/away/away_site/first_aurora/first_aurora.dmm index 8bd4b4c7324..43260756566 100644 --- a/maps/away/away_site/first_aurora/first_aurora.dmm +++ b/maps/away/away_site/first_aurora/first_aurora.dmm @@ -1148,8 +1148,8 @@ /area/template_noop) "dZ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, -/obj/item/device/taperecorder, +/obj/item/flashlight/lamp, +/obj/item/taperecorder, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/airless, @@ -1239,7 +1239,7 @@ /area/template_noop) "es" = ( /obj/structure/lattice, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/template_noop, /area/template_noop) "et" = ( @@ -1287,7 +1287,7 @@ /area/template_noop) "ez" = ( /obj/structure/table/wood, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/airless, /area/derelict/hallway/northeast) "eA" = ( @@ -1387,7 +1387,7 @@ /area/derelict/hallway/northeast) "eP" = ( /obj/structure/table/standard, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) "eQ" = ( @@ -1607,7 +1607,7 @@ /area/derelict/hallway/northeast) "ft" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) "fu" = ( @@ -1932,9 +1932,9 @@ /area/derelict/hallway/northwest) "gu" = ( /obj/structure/table/rack, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2233,7 +2233,7 @@ /turf/simulated/floor/tiled/airless, /area/derelict/hallway/northeast) "hq" = ( -/obj/item/device/flash, +/obj/item/flash, /turf/template_noop, /area/template_noop) "hs" = ( @@ -2706,7 +2706,7 @@ /obj/item/paper_bin, /obj/item/pen/blue, /obj/item/pen/red, -/obj/item/device/camera{ +/obj/item/camera{ name = "Autopsy Camera"; pixel_x = -2; pixel_y = 7 @@ -2754,7 +2754,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/mmi, +/obj/item/mmi, /obj/structure/table/standard, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) @@ -2821,7 +2821,7 @@ /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "jH" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/derelict/hallway/southwest) @@ -2956,7 +2956,7 @@ /area/derelict/hallway/southwest) "ki" = ( /obj/structure/table/standard, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/item/autopsy_scanner, /turf/simulated/floor/tiled/dark, /area/derelict/hallway/southeast) @@ -2977,7 +2977,7 @@ /turf/template_noop, /area/derelict/hallway/southeast) "km" = ( -/obj/item/device/mmi, +/obj/item/mmi, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/airless, @@ -3510,7 +3510,7 @@ /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southeast) "lX" = ( -/obj/item/device/mmi/digital/posibrain, +/obj/item/mmi/digital/posibrain, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) @@ -3724,7 +3724,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) "mH" = ( @@ -3928,7 +3928,7 @@ /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "nm" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/light, /turf/simulated/floor/tiled/airless, /area/derelict/hallway/southwest) @@ -3964,7 +3964,7 @@ /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) "ns" = ( -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, /obj/item/material/shard{ icon_state = "small" }, @@ -4114,7 +4114,7 @@ /turf/template_noop, /area/derelict/hallway/southwest) "nR" = ( -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) "nS" = ( @@ -4153,7 +4153,7 @@ /turf/simulated/floor/tiled, /area/derelict/hallway/southwest) "nW" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled, /area/derelict/hallway/southwest) "nX" = ( @@ -4204,7 +4204,7 @@ /turf/template_noop, /area/template_noop) "oh" = ( -/obj/item/device/paicard, +/obj/item/paicard, /turf/template_noop, /area/template_noop) "oi" = ( @@ -4269,7 +4269,7 @@ pixel_x = -3; pixel_y = 7 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/structure/table/standard{ name = "plastic table frame" }, @@ -4511,7 +4511,7 @@ pixel_y = 3 }, /obj/item/coin/silver, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Quartermaster EFTPOS scanner" }, /obj/effect/decal/cleanable/dirt, @@ -4589,7 +4589,7 @@ /area/derelict/hallway/southeast) "pm" = ( /obj/structure/table/glass, -/obj/item/device/radio{ +/obj/item/radio{ canhear_range = 4; desc = "Are you going to make the call?"; frequency = 1347; @@ -4881,7 +4881,7 @@ /turf/simulated/floor/airless, /area/derelict/hallway/southeast) "qf" = ( -/obj/item/device/gps/science, +/obj/item/gps/science, /turf/simulated/floor/tiled/white/airless, /area/derelict/hallway/southeast) "qg" = ( @@ -5211,7 +5211,7 @@ /area/derelict/hallway/southeast) "rl" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/derelict/hallway/southeast) @@ -5313,7 +5313,7 @@ /turf/simulated/floor/plating, /area/derelict/hallway/southeast) "rB" = ( -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/structure/table/steel, /turf/simulated/floor/plating, /area/derelict/hallway/southeast) diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm index 8a0b07aac60..63bbc0fdcc0 100644 --- a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm +++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm @@ -1011,7 +1011,7 @@ /area/hivebothub/starboarddocks) "ga" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark/full/airless, /area/hivebothub/secure) "gb" = ( @@ -1708,11 +1708,11 @@ /area/hivebothub/secure) "lb" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/price_scanner{ +/obj/item/price_scanner{ pixel_x = 5; pixel_y = 9 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark/full/airless, /area/hivebothub/secure) "lc" = ( @@ -2268,7 +2268,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/item/device/flashlight/empty{ +/obj/item/flashlight/empty{ pixel_x = -6; pixel_y = 5 }, @@ -4018,7 +4018,7 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, -/obj/item/device/personal_shield, +/obj/item/personal_shield, /turf/simulated/floor/wood/airless, /area/hivebothub/dorm2) "Bd" = ( diff --git a/maps/away/away_site/idris_wreck/idris_wreck.dm b/maps/away/away_site/idris_wreck/idris_wreck.dm index c1943ceb9ac..1bfea080a05 100644 --- a/maps/away/away_site/idris_wreck/idris_wreck.dm +++ b/maps/away/away_site/idris_wreck/idris_wreck.dm @@ -82,7 +82,7 @@ corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator/idris corpsesuit = /obj/item/clothing/suit/storage/toggle/armor/vest/idris/longcoat corpsehelmet = null - corpseback = /obj/item/device/suit_cooling_unit + corpseback = /obj/item/suit_cooling_unit corpseidjob = "Idris Security Unit" species = SPECIES_IPC diff --git a/maps/away/away_site/idris_wreck/idris_wreck.dmm b/maps/away/away_site/idris_wreck/idris_wreck.dmm index 0957da8d8df..3afe1a6b430 100644 --- a/maps/away/away_site/idris_wreck/idris_wreck.dmm +++ b/maps/away/away_site/idris_wreck/idris_wreck.dmm @@ -1195,7 +1195,7 @@ /obj/item/clothing/suit/space/void/security, /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled, /area/idris_wreck/eva) @@ -1624,7 +1624,7 @@ /obj/item/clothing/suit/space/void/security, /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled, /area/idris_wreck/eva) diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm index 302fa907ba8..d0559aa9f9b 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm @@ -85,8 +85,8 @@ /area/point_verdant/interior/offices/kaf) "acZ" = ( /obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/device/radio/hailing{ +/obj/item/measuring_tape, +/obj/item/radio/hailing{ pixel_x = 8; pixel_y = 3 }, @@ -1591,7 +1591,7 @@ /obj/item/storage/box/fancy/cigarettes/dromedaryco, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled, /area/point_verdant/interior/hotel/basement) "aVK" = ( @@ -1670,7 +1670,7 @@ "aXv" = ( /obj/structure/table/wood, /obj/machinery/door/window/eastright, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 4; pixel_y = -2 }, @@ -2143,7 +2143,7 @@ "bky" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/point_verdant/interior/pharmacy) @@ -2358,7 +2358,7 @@ /area/point_verdant/interior/police) "bpR" = ( /obj/structure/table/stone/marble, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/wood, @@ -2599,7 +2599,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "bvK" = ( -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/sidewalk/dark, /area/point_verdant/interior/offices/kaf) "bvT" = ( @@ -2911,10 +2911,10 @@ /area/point_verdant/interior/cafe) "bEK" = ( /obj/structure/closet/crate, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/item/storage/box/fancy/donut, -/obj/item/device/taperecorder, -/obj/item/device/hand_labeler, +/obj/item/taperecorder, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/full, /area/point_verdant/interior/police) "bEV" = ( @@ -3212,21 +3212,21 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/minimart) "bLF" = ( -/obj/item/device/vending_refill/coffee, +/obj/item/vending_refill/coffee, /obj/structure/table/rack/retail_shelf, -/obj/item/device/vending_refill/cutlery, -/obj/item/device/vending_refill/cola, +/obj/item/vending_refill/cutlery, +/obj/item/vending_refill/cola, /obj/machinery/light/small{ dir = 8 }, -/obj/item/device/hand_labeler, -/obj/item/device/flashlight{ +/obj/item/hand_labeler, +/obj/item/flashlight{ pixel_y = 12 }, -/obj/item/device/measuring_tape{ +/obj/item/measuring_tape{ pixel_y = 2 }, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/lino, /area/point_verdant/interior/restaurant) "bLS" = ( @@ -3236,7 +3236,7 @@ /area/point_verdant/interior/offices/kaf) "bLY" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/purple{ +/obj/item/flashlight/lamp/lava/purple{ pixel_y = 5 }, /turf/simulated/floor/carpet/darkblue, @@ -3494,7 +3494,7 @@ "bVP" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/device/flashlight/lamp/lava/green{ +/obj/item/flashlight/lamp/lava/green{ pixel_y = 6 }, /turf/simulated/floor/wood, @@ -3658,7 +3658,7 @@ /obj/structure/table/reinforced/wood, /obj/item/material/sword/katana, /obj/item/material/hook, -/obj/item/device/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/guitar, /obj/machinery/light/colored/decayed{ pixel_y = -2 }, @@ -3965,7 +3965,7 @@ /area/point_verdant/interior/decrepit) "cks" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /turf/simulated/floor/wood, @@ -4356,7 +4356,7 @@ /area/point_verdant/interior/robotics) "cwD" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/lino, /area/point_verdant/interior/police) "cwF" = ( @@ -4863,7 +4863,7 @@ /area/point_verdant/outdoors) "cMF" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /obj/structure/rod_railing{ @@ -5249,7 +5249,7 @@ /area/point_verdant/interior/hotel) "cUW" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, /turf/simulated/floor/tiled/full, /area/point_verdant/interior/bar) "cVd" = ( @@ -5301,7 +5301,7 @@ /area/point_verdant/interior/tunnels) "cWF" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /obj/item/material/ashtray/bronze{ @@ -5437,9 +5437,9 @@ /obj/item/melee/baton/loaded, /obj/item/melee/baton/loaded, /obj/item/melee/baton/loaded, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /obj/item/gun/energy/taser, /obj/item/gun/energy/taser, /obj/item/gun/energy/taser, @@ -5771,7 +5771,7 @@ /area/point_verdant/interior/police) "dhS" = ( /obj/structure/table/wood, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/wood, /area/point_verdant/interior/restaurant) "dhT" = ( @@ -7089,7 +7089,7 @@ /area/point_verdant/outdoors) "dXL" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /obj/item/material/knife/butterfly{ @@ -7306,7 +7306,7 @@ /area/point_verdant/interior/hotel) "ecu" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 6; pixel_y = 3 }, @@ -7366,13 +7366,13 @@ /area/point_verdant/interior/parking) "eeJ" = ( /obj/structure/table/standard, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = 5 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = -1 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = -8 }, /turf/simulated/floor/tiled/white, @@ -7661,7 +7661,7 @@ /area/point_verdant/interior/restaurant) "emi" = ( /obj/structure/table/wood, -/obj/item/device/megaphone, +/obj/item/megaphone, /turf/simulated/floor/sidewalk/dark, /area/point_verdant/interior/offices/kaf) "emp" = ( @@ -7817,16 +7817,16 @@ }, /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/red, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, /turf/simulated/floor/tiled, @@ -8035,10 +8035,10 @@ /area/point_verdant/interior/tunnels) "etj" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flash, -/obj/item/device/flashlight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flash, +/obj/item/flashlight, /turf/simulated/floor/tiled/full, /area/point_verdant/interior/police) "etR" = ( @@ -8438,7 +8438,7 @@ pixel_x = 4; pixel_y = 11 }, -/obj/item/device/mass_spectrometer/adv{ +/obj/item/mass_spectrometer/adv{ pixel_y = 7; pixel_x = -5 }, @@ -8545,7 +8545,7 @@ /obj/machinery/door/window/desk/southright{ req_access = list(219) }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/wood, @@ -8644,7 +8644,7 @@ pixel_x = -6; pixel_y = 5 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_y = 6; pixel_x = 9 }, @@ -8857,7 +8857,7 @@ /area/point_verdant/outdoors) "eQO" = ( /obj/structure/table/stone/marble, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/material/cardboard{ amount = 10; pixel_x = 1; @@ -9280,7 +9280,7 @@ /area/point_verdant/interior) "fcZ" = ( /obj/structure/table/steel, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 9; pixel_y = 11 }, @@ -9633,7 +9633,7 @@ pixel_x = -5; pixel_y = 3 }, -/obj/item/device/flashlight/lamp/lava/cyan{ +/obj/item/flashlight/lamp/lava/cyan{ pixel_y = 3; pixel_x = 5 }, @@ -9687,7 +9687,7 @@ /area/point_verdant/interior/police) "foO" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -3; pixel_y = 3 }, @@ -9898,7 +9898,7 @@ /area/point_verdant/interior/police) "ftu" = ( /obj/structure/table/wood, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 3; pixel_y = 2 }, @@ -10460,7 +10460,7 @@ /area/point_verdant/interior/shallow) "fKm" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 8; pixel_x = -4 }, @@ -10511,7 +10511,7 @@ /area/point_verdant/interior) "fLq" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 11 }, /turf/simulated/floor/carpet/red, @@ -10622,7 +10622,7 @@ /obj/item/reagent_containers/spray/pepper{ pixel_x = -10 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 6 }, /obj/effect/floor_decal/corner/blue{ @@ -11015,10 +11015,10 @@ pixel_x = 11; pixel_y = 6 }, -/obj/item/device/lightreplacer{ +/obj/item/lightreplacer{ pixel_y = 13 }, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /obj/structure/rod_railing{ name = "imposing rod railing" }, @@ -11267,8 +11267,8 @@ "glJ" = ( /obj/structure/table/wood, /obj/item/tape_roll, -/obj/item/device/toner, -/obj/item/device/toner, +/obj/item/toner, +/obj/item/toner, /turf/simulated/floor/wood, /area/point_verdant/interior/restaurant) "gmm" = ( @@ -12068,7 +12068,7 @@ /area/point_verdant/interior/offices/basement) "gMm" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -3; pixel_y = 3 }, @@ -13263,7 +13263,7 @@ /obj/item/pen/black{ pixel_y = 6 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/wood, /area/point_verdant/interior/bar) "hCA" = ( @@ -13566,7 +13566,7 @@ /area/point_verdant/interior/parking) "hLy" = ( /obj/structure/table/standard, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 10 }, /obj/item/pen/reagent/hyperzine, @@ -14024,7 +14024,7 @@ }, /obj/item/tape_roll, /obj/structure/table/rack, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/wood, /area/point_verdant/interior/arcade) "hZq" = ( @@ -14673,7 +14673,7 @@ pixel_x = -5 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/cyan{ +/obj/item/flashlight/lamp/lava/cyan{ pixel_y = 3; pixel_x = 5 }, @@ -15261,14 +15261,14 @@ /area/point_verdant/interior/tailor) "iIa" = ( /obj/structure/closet/crate, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, /turf/simulated/floor/tiled/full, /area/point_verdant/interior/police) "iIi" = ( @@ -15617,11 +15617,11 @@ "iTn" = ( /obj/structure/table/rack, /obj/item/storage/bag/circuits/basic, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = 6; pixel_y = 4 }, @@ -16550,7 +16550,7 @@ /area/point_verdant/interior/shallow) "juE" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -2; pixel_y = 7 }, @@ -16618,7 +16618,7 @@ dir = 1 }, /obj/item/pen, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/point_verdant/interior/spaceport) "jwv" = ( @@ -16910,7 +16910,7 @@ "jIm" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup, -/obj/item/device/laser_pointer, +/obj/item/laser_pointer, /obj/item/reagent_containers/food/drinks/cans/iced_tea{ pixel_x = 17; pixel_y = 4 @@ -17231,7 +17231,7 @@ /area/point_verdant/interior/hotel) "jQf" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/wood, @@ -17321,7 +17321,7 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/point_verdant/outdoors) "jSm" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/wood, /obj/item/key/door_key{ pixel_x = -10 @@ -17582,7 +17582,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/police) "jZl" = ( -/obj/item/device/vending_refill/coffee{ +/obj/item/vending_refill/coffee{ pixel_y = -15; pixel_x = 2 }, @@ -18347,8 +18347,8 @@ /obj/structure/table/stone/marble, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/device/destTagger, -/obj/item/device/destTagger, +/obj/item/destTagger, +/obj/item/destTagger, /obj/item/crowbar/red{ pixel_x = -11 }, @@ -18756,7 +18756,7 @@ /area/point_verdant/water) "kEC" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 9 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup{ @@ -19487,7 +19487,7 @@ /area/point_verdant/outdoors) "lak" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/point_verdant/interior/restaurant) "laz" = ( @@ -20307,11 +20307,11 @@ /area/point_verdant/interior/parking) "lAg" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -5; pixel_y = -2 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ on = 0; pixel_x = 5; pixel_y = 13 @@ -20495,7 +20495,7 @@ "lDD" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/device/laser_pointer, +/obj/item/laser_pointer, /turf/simulated/floor/carpet/purple, /area/point_verdant/interior/laundromat) "lDE" = ( @@ -21311,7 +21311,7 @@ /area/point_verdant/interior/offices/kaf) "lYm" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/random/dirt_75, /turf/simulated/floor/tiled/white, /area/point_verdant/interior/robotics) @@ -22005,11 +22005,11 @@ /obj/item/weldingtool/experimental, /obj/item/rfd/construction, /obj/item/rfd/construction, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = 11; pixel_x = 7 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = 11 }, /obj/effect/floor_decal/industrial/outline/red, @@ -22314,7 +22314,7 @@ dir = 8; pixel_x = -10 }, -/obj/item/device/megaphone/stagemicrophone{ +/obj/item/megaphone/stagemicrophone{ pixel_x = 5; pixel_y = -5 }, @@ -22346,7 +22346,7 @@ /area/point_verdant/interior/offices/basement) "mGh" = ( /obj/structure/table/wood, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 4; pixel_y = 1 }, @@ -22574,9 +22574,9 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/pharmacy) "mMQ" = ( -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/point_verdant/interior/offices/basement) @@ -22915,8 +22915,8 @@ /area/point_verdant/outdoors) "mUx" = ( /obj/structure/table/wood, -/obj/item/device/toner, -/obj/item/device/toner, +/obj/item/toner, +/obj/item/toner, /obj/item/storage/box/unique/donkpockets, /turf/simulated/floor/wood, /area/point_verdant/interior/tailor) @@ -23978,7 +23978,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) "nBC" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /obj/structure/table/wood, @@ -24366,7 +24366,7 @@ /area/point_verdant/interior/restaurant) "nOI" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /obj/machinery/light/small{ @@ -24431,7 +24431,7 @@ /obj/item/storage/pill_bottle/assorted{ pixel_x = 5 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -8; pixel_y = 5 }, @@ -24635,7 +24635,7 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/point_verdant/interior/tunnels) "nXY" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 2 }, /obj/structure/table/wood, @@ -24932,7 +24932,7 @@ "oko" = ( /obj/effect/floor_decal/corner_wide/black/diagonal, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -3; pixel_y = 3 }, @@ -26165,7 +26165,7 @@ "oRK" = ( /obj/effect/floor_decal/corner/dark_green/diagonal, /obj/structure/table/standard, -/obj/item/device/advanced_healthanalyzer, +/obj/item/advanced_healthanalyzer, /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/point_verdant/interior/pharmacy) @@ -26286,11 +26286,11 @@ /area/point_verdant/outdoors) "oWH" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/green{ +/obj/item/flashlight/lamp/lava/green{ pixel_y = 8; pixel_x = 5 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_y = 7; pixel_x = -6 }, @@ -26455,7 +26455,7 @@ /area/point_verdant/interior/offices/kaf) "pdZ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 11; pixel_x = 5 }, @@ -26911,7 +26911,7 @@ /area/point_verdant/water/deep) "pqY" = ( /obj/structure/table/wood, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /obj/item/tape_roll, /turf/simulated/floor/wood, /area/point_verdant/interior/bar) @@ -27089,7 +27089,7 @@ /area/point_verdant/interior/streetvendor) "puZ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/purple{ +/obj/item/flashlight/lamp/lava/purple{ pixel_x = 5; pixel_y = 4 }, @@ -27203,7 +27203,7 @@ "pyO" = ( /obj/effect/floor_decal/corner_wide/black/diagonal, /obj/structure/table/standard, -/obj/item/device/megaphone{ +/obj/item/megaphone{ pixel_x = -1; pixel_y = 16 }, @@ -28640,7 +28640,7 @@ /obj/item/pen{ pixel_x = 6 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -4; pixel_y = 3 }, @@ -28745,7 +28745,7 @@ /area/point_verdant/outdoors) "qCb" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -2; pixel_y = 7 }, @@ -29468,7 +29468,7 @@ /area/point_verdant/interior/streetvendor) "qWC" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -6; pixel_y = 7 }, @@ -29677,11 +29677,11 @@ /obj/item/tape_roll, /obj/item/towel, /obj/item/wrench, -/obj/item/device/paicard, -/obj/item/device/flashlight{ +/obj/item/paicard, +/obj/item/flashlight{ pixel_y = 12 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/towel, /obj/item/tape_roll, /turf/simulated/floor/lino, @@ -29934,11 +29934,11 @@ /obj/structure/closet/secure_closet{ req_access = list(218) }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, @@ -30220,7 +30220,7 @@ /area/point_verdant/outdoors) "rsz" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -2; pixel_y = 7 }, @@ -30621,7 +30621,7 @@ /area/point_verdant/interior/bar) "rGF" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/wood, @@ -31343,7 +31343,7 @@ /area/point_verdant/outdoors) "sfC" = ( /obj/machinery/shipsensors/weak, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_x = -23; name = "static GPS (Air Traffic Control - Point Verdant)"; gpstag = "SCC-FOB" @@ -31420,7 +31420,7 @@ /area/point_verdant/outdoors) "sji" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -2; pixel_y = 7 }, @@ -31642,7 +31642,7 @@ "sqt" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /turf/simulated/floor/wood, /area/point_verdant/interior/arcade) "sqB" = ( @@ -31740,7 +31740,7 @@ /obj/item/pen{ pixel_x = 6 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -4; pixel_y = 3 }, @@ -32689,7 +32689,7 @@ /obj/effect/floor_decal/corner_wide/white{ dir = 5 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/tiled, /area/point_verdant/interior/offices/basement) "tal" = ( @@ -32697,11 +32697,11 @@ /obj/effect/floor_decal/corner/green/diagonal{ dir = 4 }, -/obj/item/device/reagent_scanner{ +/obj/item/reagent_scanner{ pixel_x = 9; pixel_y = 6 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -6; pixel_y = 6 }, @@ -33207,7 +33207,7 @@ /area/point_verdant/outdoors) "tlv" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -3; pixel_y = 3 }, @@ -34140,11 +34140,11 @@ "tOV" = ( /obj/structure/table/rack/retail_shelf, /obj/item/tape_roll, -/obj/item/device/measuring_tape{ +/obj/item/measuring_tape{ pixel_y = 2 }, -/obj/item/device/hand_labeler, -/obj/item/device/flashlight{ +/obj/item/hand_labeler, +/obj/item/flashlight{ pixel_y = 12 }, /turf/simulated/floor/wood, @@ -34296,7 +34296,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "tVl" = ( -/obj/item/device/flashlight/lamp/lava/green{ +/obj/item/flashlight/lamp/lava/green{ pixel_y = 6 }, /obj/structure/table/wood, @@ -34818,11 +34818,11 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/device/vending_refill/cola{ +/obj/item/vending_refill/cola{ pixel_y = -8 }, -/obj/item/device/vending_refill/coffee, -/obj/item/device/vending_refill/snack{ +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/snack{ pixel_y = 8 }, /turf/simulated/floor/lino/diamond, @@ -34845,7 +34845,7 @@ "unJ" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 3; pixel_y = 11 }, @@ -35386,7 +35386,7 @@ /area/point_verdant/interior/arcade) "uEp" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 9 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -35806,7 +35806,7 @@ /area/point_verdant/outdoors) "uQE" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 14 }, /turf/simulated/floor/carpet/lightblue, @@ -35920,7 +35920,7 @@ name = "operation map"; pixel_y = 31 }, -/obj/item/device/laser_pointer/blue{ +/obj/item/laser_pointer/blue{ pixel_x = -12; pixel_y = 5 }, @@ -36075,7 +36075,7 @@ /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "uXg" = ( -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 3 }, /obj/structure/table/wood, @@ -36255,7 +36255,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/tiled/white, @@ -36346,7 +36346,7 @@ "vcU" = ( /obj/structure/table/steel, /obj/item/crowbar, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_y = 8 }, /turf/simulated/floor/tiled/white, @@ -36494,7 +36494,7 @@ "vhc" = ( /obj/effect/decal/curb, /obj/structure/table/steel, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/tiled/full, /area/point_verdant/interior/spaceport) "vhr" = ( @@ -37238,8 +37238,8 @@ /area/point_verdant/interior/maint_janitorial) "vDC" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/pin_extractor, -/obj/item/device/t_scanner{ +/obj/item/pin_extractor, +/obj/item/t_scanner{ pixel_x = -14 }, /obj/effect/decal/cleanable/dirt, @@ -37443,7 +37443,7 @@ /area/point_verdant/interior/streetvendor) "vHW" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/radiojammer, +/obj/item/radiojammer, /obj/effect/decal/cleanable/dirt, /obj/item/newspaper{ pixel_x = 7 @@ -37665,7 +37665,7 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) "vOG" = ( -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 3 }, /obj/structure/table/wood, @@ -37754,7 +37754,7 @@ /area/point_verdant/interior/shallow) "vRN" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, /obj/item/tape_roll{ @@ -38217,7 +38217,7 @@ /area/point_verdant/interior) "wih" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/lino/diamond, @@ -38580,7 +38580,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) "wuQ" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/wood, /obj/random/dirt_75, /obj/random/dirt_75, @@ -38662,7 +38662,7 @@ /turf/simulated/floor/tiled/full, /area/point_verdant/interior/police) "wwy" = ( -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 3 }, /obj/structure/table/wood, @@ -39676,7 +39676,7 @@ /area/point_verdant/interior/maint_janitorial) "wZo" = ( /obj/structure/table/rack/retail_shelf, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7; pixel_x = -2 }, @@ -39796,7 +39796,7 @@ "xbG" = ( /obj/structure/table/wood, /obj/item/folder/red, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /obj/machinery/light/small{ dir = 4 }, @@ -40013,7 +40013,7 @@ /area/point_verdant/outdoors) "xib" = ( /obj/structure/closet/chefcloset, -/obj/item/device/quikpay, +/obj/item/quikpay, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/point_verdant/interior/restaurant) @@ -40317,7 +40317,7 @@ /area/point_verdant/interior/streetvendor) "xpp" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/headlights, +/obj/item/flashlight/headlights, /obj/item/cell/hyper{ pixel_x = -4; pixel_y = -10 @@ -40492,14 +40492,14 @@ /area/point_verdant/interior/minimart) "xtS" = ( /obj/structure/table/rack, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera{ +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30 }, -/obj/item/device/camera{ +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30 @@ -41069,7 +41069,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /turf/simulated/floor/wood, /area/point_verdant/interior/tailor) "xMa" = ( @@ -41954,7 +41954,7 @@ pixel_x = -5 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/cyan{ +/obj/item/flashlight/lamp/lava/cyan{ pixel_y = 3; pixel_x = 5 }, diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm b/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm index 4f1943cbabc..768caf530db 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm @@ -80,7 +80,7 @@ shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/konyang/police id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship belt = /obj/item/storage/belt/security r_pocket = /obj/item/storage/wallet/random back = /obj/item/storage/backpack/satchel @@ -280,7 +280,7 @@ l_pocket = /obj/item/storage/wallet/random back = /obj/item/storage/backpack/satchel/eng belt = /obj/item/storage/belt/utility/full - r_pocket = /obj/item/device/radio + r_pocket = /obj/item/radio /datum/ghostspawner/human/konyang_gwok short_name = "konyang_gwok" @@ -332,7 +332,7 @@ shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/konyang/army l_pocket = /obj/item/storage/wallet/random - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress belt = /obj/item/storage/belt/military back = /obj/item/storage/backpack/rucksack/tan id = /obj/item/card/id @@ -368,7 +368,7 @@ /obj/item/storage/firstaid/adv = 1, /obj/item/storage/firstaid/combat = 1, /obj/item/handcuffs/ziptie = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1, /obj/item/stack/nanopaste = 1, @@ -427,7 +427,7 @@ belt = /obj/item/storage/belt/military gloves = /obj/item/clothing/gloves/swat/ert glasses = /obj/item/clothing/glasses - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert id = /obj/item/card/id/zeng_hu belt_contents = list( /obj/item/handcuffs = 2, @@ -477,7 +477,7 @@ /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, /obj/item/handcuffs = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/stack/medical/advanced/bruise_pack = 1, /obj/item/stack/medical/advanced/ointment = 1 ) diff --git a/maps/away/away_site/magshield/magshield.dmm b/maps/away/away_site/magshield/magshield.dmm index ff11b638f1f..61668301fd9 100644 --- a/maps/away/away_site/magshield/magshield.dmm +++ b/maps/away/away_site/magshield/magshield.dmm @@ -568,7 +568,7 @@ /area/magshield/east) "bG" = ( /obj/structure/closet, -/obj/item/device/flashlight/flare/glowstick/random, +/obj/item/flashlight/flare/glowstick/random, /turf/simulated/floor/airless, /area/magshield/smes_storage) "bH" = ( @@ -884,7 +884,7 @@ /turf/simulated/floor/airless, /area/magshield/smes_storage) "cA" = ( -/obj/item/device/flashlight/flare/glowstick/yellow, +/obj/item/flashlight/flare/glowstick/yellow, /turf/simulated/floor/airless, /area/magshield/smes_storage) "cB" = ( @@ -965,7 +965,7 @@ "cL" = ( /obj/structure/closet, /obj/item/clothing/suit/radiation, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/airless, /area/magshield/engine) "cM" = ( diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index d7f0f33fbe3..0d4928ed292 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -72,7 +72,7 @@ /area/overgrown_mining_station) "an" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp/lava/green, +/obj/item/flashlight/lamp/lava/green, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, @@ -1066,7 +1066,7 @@ /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "xi" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "xk" = ( @@ -1671,7 +1671,7 @@ "Jw" = ( /obj/structure/table/standard, /obj/item/trash/plate, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled/rust/airless, /area/overgrown_mining_station) "JD" = ( @@ -1813,7 +1813,7 @@ /turf/simulated/floor/exoplanet/asteroid/ash, /area/overgrown_mining_station) "Nb" = ( -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "Nh" = ( @@ -2149,7 +2149,7 @@ /turf/simulated/floor/diona/airless, /area/overgrown_mining_station) "VA" = ( -/obj/item/device/electronic_assembly/large/industrial, +/obj/item/electronic_assembly/large/industrial, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "VC" = ( diff --git a/maps/away/away_site/phoron_deposit/phoron_deposit.dmm b/maps/away/away_site/phoron_deposit/phoron_deposit.dmm index 440a8e02c9a..1054c1076c1 100644 --- a/maps/away/away_site/phoron_deposit/phoron_deposit.dmm +++ b/maps/away/away_site/phoron_deposit/phoron_deposit.dmm @@ -119,7 +119,7 @@ /area/phoron_deposit_shuttle) "da" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark/airless, /area/phoron_deposit_shuttle) "dG" = ( @@ -169,7 +169,7 @@ /turf/simulated/floor/exoplanet/asteroid/ash/rocky, /area/mine) "fs" = ( -/obj/item/device/flashlight/flare/glowstick/yellow, +/obj/item/flashlight/flare/glowstick/yellow, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, /area/mine) "fB" = ( @@ -237,7 +237,7 @@ pixel_y = 4; pixel_x = 6 }, -/obj/item/device/flashlight/lamp/lava/blue{ +/obj/item/flashlight/lamp/lava/blue{ pixel_y = 4; pixel_x = -7 }, @@ -821,7 +821,7 @@ /area/mine) "CD" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 5; pixel_x = -8 }, @@ -909,7 +909,7 @@ /area/phoron_deposit_shuttle) "EJ" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 4; pixel_x = -9 }, @@ -1246,7 +1246,7 @@ "Sf" = ( /obj/random/dirt_75, /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/reinforced/airless, /area/phoron_deposit_shuttle) "SE" = ( @@ -1275,7 +1275,7 @@ /area/phoron_deposit_shuttle) "Tx" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/light/broken{ dir = 4 }, @@ -1358,7 +1358,7 @@ "Wt" = ( /obj/item/ammo_casing/rifle/used, /obj/item/ammo_casing/rifle/used, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 12; pixel_x = 3 }, diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm index 4f74d36c661..03fc5892f44 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dmm +++ b/maps/away/away_site/pirate_base/pirate_base.dmm @@ -205,7 +205,7 @@ /turf/simulated/floor/tiled, /area/piratebase/eva) "aV" = ( -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_y = -10; pixel_x = -5 }, @@ -571,7 +571,7 @@ pixel_y = 4 }, /obj/random/dirt_75, -/obj/item/device/transfer_valve{ +/obj/item/transfer_valve{ pixel_x = -7; pixel_y = 5 }, @@ -688,7 +688,7 @@ /area/piratebase/power) "dx" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/beige{ dir = 6 }, @@ -3292,11 +3292,11 @@ /obj/effect/floor_decal/corner/grey/full{ dir = 1 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/piratebase/eva) "pB" = ( @@ -3413,11 +3413,11 @@ dir = 10 }, /obj/structure/table/standard, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -4; pixel_y = 7 }, -/obj/item/device/breath_analyzer{ +/obj/item/breath_analyzer{ pixel_x = 7 }, /obj/item/bodybag/cryobag{ @@ -3452,7 +3452,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_x = -4; pixel_y = 5 }, @@ -4413,7 +4413,7 @@ pixel_x = 6; pixel_y = 1 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 14 }, /turf/simulated/floor/tiled, @@ -4520,7 +4520,7 @@ "wB" = ( /obj/structure/table/steel, /obj/random/dirt_75, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_x = 8; pixel_y = 5 }, @@ -4780,7 +4780,7 @@ /area/shuttle/pirate_shuttle/storage) "xQ" = ( /obj/structure/table/steel, -/obj/item/device/versebook/trinary{ +/obj/item/versebook/trinary{ pixel_x = 4; pixel_y = 3 }, @@ -5081,7 +5081,7 @@ /area/piratebase/hallway_north) "zs" = ( /obj/structure/table/steel, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, /area/shuttle/pirate_shuttle/med) @@ -7352,7 +7352,7 @@ /turf/simulated/floor/plating, /area/piratebase/hallway_south) "KX" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -8; pixel_y = 6 }, @@ -8066,7 +8066,7 @@ "Ox" = ( /obj/structure/table/steel, /obj/random/dirt_75, -/obj/item/device/assembly/timer{ +/obj/item/assembly/timer{ pixel_y = -21; pixel_x = -4 }, @@ -8288,22 +8288,22 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, /turf/simulated/floor/tiled, @@ -8377,19 +8377,19 @@ pixel_x = -3; pixel_y = -9 }, -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_x = -4; pixel_y = 4 }, @@ -8397,7 +8397,7 @@ /area/piratebase/equipment) "PX" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/marshallingwand{ +/obj/item/flashlight/marshallingwand{ pixel_x = -9; pixel_y = 5 }, @@ -8993,7 +8993,7 @@ /obj/machinery/light/small/emergency{ dir = 1 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 2; pixel_y = -1 }, @@ -9592,7 +9592,7 @@ /obj/structure/table/standard, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -6; pixel_y = 11 }, @@ -9723,36 +9723,36 @@ "Wt" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor/tiled/dark, /area/piratebase/equipment) "Wu" = ( @@ -9817,7 +9817,7 @@ pixel_x = 12; pixel_y = 10 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -5; pixel_y = 1 }, @@ -10032,19 +10032,19 @@ /area/piratebase/quarters) "XP" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -6; pixel_y = 3 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -6; pixel_y = 3 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -6; pixel_y = 3 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = 5 }, @@ -10052,23 +10052,23 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/plating, /area/piratebase/equipment) "XS" = ( diff --git a/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm b/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm index de854d0d67c..567f2077ddc 100644 --- a/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm +++ b/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm @@ -154,7 +154,7 @@ back = /obj/item/storage/backpack/satchel/leather id = null - backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/screwdriver = 1, /obj/item/wirecutters = 1, /obj/item/device/radio = 1, /obj/item/device/multitool = 1) + backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/screwdriver = 1, /obj/item/wirecutters = 1, /obj/item/radio = 1, /obj/item/multitool = 1) species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA = /obj/item/clothing/shoes/jackboots/toeless, diff --git a/maps/away/away_site/quarantined_outpost/quarantined_outpost.dmm b/maps/away/away_site/quarantined_outpost/quarantined_outpost.dmm index b792b97f4bc..1ff44df3fb5 100644 --- a/maps/away/away_site/quarantined_outpost/quarantined_outpost.dmm +++ b/maps/away/away_site/quarantined_outpost/quarantined_outpost.dmm @@ -4225,7 +4225,7 @@ "cYx" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/reinforced/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -9; pixel_y = 8 }, @@ -4655,7 +4655,7 @@ pixel_x = -6; pixel_y = 2 }, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled, /area/quarantined_outpost/entrance_lobby) "dnn" = ( @@ -5085,7 +5085,7 @@ }, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8 }, /turf/simulated/floor/exoplanet/basalt, @@ -8026,7 +8026,7 @@ /obj/structure/table/standard, /obj/random/dirt_75, /obj/random/tech_supply, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8 }, /obj/random/powercell{ @@ -13288,7 +13288,7 @@ "iZI" = ( /obj/effect/floor_decal/corner/yellow/full, /obj/structure/table/standard, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/tiled/gunmetal, /area/quarantined_outpost/engineering/tunnel) "iZS" = ( @@ -14108,7 +14108,7 @@ /obj/structure/platform{ dir = 1 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 8; pixel_x = 6 }, @@ -18332,7 +18332,7 @@ "mnk" = ( /obj/structure/table/standard, /obj/item/folder/yellow, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /turf/simulated/floor/tiled, /area/quarantined_outpost/cargo_bay) "mnq" = ( @@ -19829,7 +19829,7 @@ /area/quarantined_outpost/elevator_hallway) "nnj" = ( /obj/structure/table/standard, -/obj/item/device/laser_pointer/red, +/obj/item/laser_pointer/red, /obj/random/dirt_75, /turf/simulated/floor/tiled/airless, /area/quarantined_outpost/security) @@ -23261,7 +23261,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -7 }, /turf/simulated/floor/plating, @@ -27114,7 +27114,7 @@ pixel_x = 5; pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = 10; pixel_x = -3 }, @@ -27321,7 +27321,7 @@ dir = 8 }, /obj/random/dirt_75, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/tiled/gunmetal, /area/quarantined_outpost/engineering) "rZl" = ( @@ -29255,7 +29255,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/tiled/dark/full, /area/quarantined_outpost/elevator_hallway) "toM" = ( @@ -32007,7 +32007,7 @@ dir = 4 }, /obj/random/junk, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 7; pixel_x = -7 }, @@ -36448,11 +36448,11 @@ dir = 9 }, /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 14; pixel_x = 3 }, -/obj/item/device/pin_extractor{ +/obj/item/pin_extractor{ pixel_x = 3 }, /turf/simulated/floor/reinforced, diff --git a/maps/away/away_site/quarantined_outpost/quarantined_outpost_objects.dm b/maps/away/away_site/quarantined_outpost/quarantined_outpost_objects.dm index 88fd612935b..6cb8b4c3b10 100644 --- a/maps/away/away_site/quarantined_outpost/quarantined_outpost_objects.dm +++ b/maps/away/away_site/quarantined_outpost/quarantined_outpost_objects.dm @@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(trackables_pool) // If the mob was burned before time ran out, we stop the timer and processing. /mob/living/simple_animal/hostile/revivable/process() var/turf/T = get_turf(src) - var/obj/item/device/flashlight/flare/F = locate(/obj/item/device/flashlight/flare) in T + var/obj/item/flashlight/flare/F = locate(/obj/item/flashlight/flare) in T if(F?.on) src.IgniteMob(2) F.fuel = 0 @@ -639,7 +639,7 @@ GLOBAL_LIST_EMPTY(trackables_pool) toggle_fastening(user) return TRUE - if(istype(attacking_item, /obj/item/device/analyzer) && Adjacent(user)) + if(istype(attacking_item, /obj/item/analyzer) && Adjacent(user)) to_chat(user, "[icon2html(src, user)] The pressure indicator on \the [src] reads: [percentage]% full!") return TRUE return ..() @@ -820,7 +820,7 @@ GLOBAL_LIST_EMPTY(trackables_pool) post_activation() /obj/machinery/mob_tracker/server_relay/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/device/multitool)) + if(istype(attacking_item, /obj/item/multitool)) if(stat & NOPOWER) to_chat(user, SPAN_NOTICE("\The [src] is not powered, completely unresponsive to your inputs.")) return diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm index e0775131eca..2cec443ea31 100644 --- a/maps/away/away_site/racers/racers.dmm +++ b/maps/away/away_site/racers/racers.dmm @@ -41,7 +41,7 @@ "abW" = ( /obj/item/rig/eva, /obj/structure/table/rack, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/plating, /area/racers) "acU" = ( @@ -370,7 +370,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_cycler/mining, /obj/item/clothing/suit/space/void/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /obj/item/clothing/head/helmet/space/void/mining, /obj/item/tank/oxygen/brown, /turf/simulated/floor/tiled/white/airless, @@ -590,7 +590,7 @@ /turf/simulated/floor/tiled/rust, /area/racers) "bXJ" = ( -/obj/item/device/radio/beacon{ +/obj/item/radio/beacon{ name = "hangar B beacon" }, /turf/simulated/floor/tiled/rust, @@ -1192,7 +1192,7 @@ /obj/item/material/shard/shrapnel, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/remains/robot/burned, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/template_noop, /area/racers) "fGz" = ( @@ -1474,7 +1474,7 @@ pixel_x = -7; pixel_y = 18 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 8 }, @@ -1771,7 +1771,7 @@ /obj/machinery/computer/ship/helm{ req_access = list(204) }, -/obj/item/device/gps, +/obj/item/gps, /obj/machinery/camera/network/thunder, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/racers_blue) @@ -2067,7 +2067,7 @@ /area/space) "jIJ" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/rust, /area/racers) "jIR" = ( @@ -2143,7 +2143,7 @@ /area/racers) "kdB" = ( /obj/effect/decal/cleanable/liquid_fuel, -/obj/item/device/radio/beacon{ +/obj/item/radio/beacon{ name = "hangar D beacon" }, /turf/simulated/floor/tiled/rust, @@ -2208,7 +2208,7 @@ /turf/simulated/floor/plating, /area/racers) "kFu" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/rust, /area/racers) "kFN" = ( @@ -2326,16 +2326,16 @@ /area/space) "lqQ" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/rust, /area/racers) "lsj" = ( /obj/structure/table/steel, /obj/item/tape_roll, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/plating, /area/racers) "lsB" = ( @@ -2490,7 +2490,7 @@ dir = 4 }, /obj/item/storage/toolbox/mechanical, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/racers) "lZa" = ( @@ -2605,10 +2605,10 @@ /obj/item/clothing/accessory/tie/red_clip, /obj/item/clothing/gloves/boxing, /obj/item/book/manual/atmospipes, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /turf/simulated/floor/plating, /area/racers) "mEc" = ( @@ -2679,10 +2679,10 @@ "mZC" = ( /obj/effect/decal/cleanable/dirt, /obj/item/material/stool/chair/wood, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/holofloor/tiled, /area/racers) "naE" = ( @@ -2853,8 +2853,8 @@ pixel_y = 13 }, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, -/obj/item/device/destTagger, +/obj/item/hand_labeler, +/obj/item/destTagger, /turf/simulated/floor/tiled/white, /area/racers) "nWn" = ( @@ -2988,10 +2988,10 @@ /turf/simulated/floor/plating, /area/racers) "oqy" = ( -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/structure/table/rack, /turf/simulated/floor/tiled/rust, /area/racers) @@ -3050,7 +3050,7 @@ /area/racers) "oNS" = ( /obj/machinery/pipedispenser, -/obj/item/device/laser_pointer/red, +/obj/item/laser_pointer/red, /turf/simulated/floor/plating, /area/racers) "oQI" = ( @@ -3300,8 +3300,8 @@ /area/racers) "qex" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /obj/structure/table/rack, /turf/simulated/floor/tiled/rust, /area/racers) @@ -3383,7 +3383,7 @@ /obj/item/storage/toolbox/mechanical, /obj/item/rig/eva, /obj/structure/table/rack, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/holofloor/tiled, /area/racers) "qvR" = ( @@ -3946,7 +3946,7 @@ /turf/simulated/floor/tiled/white/airless, /area/racers) "thq" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/holofloor/tiled, /area/racers) "thx" = ( @@ -3992,7 +3992,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/racers) "twh" = ( @@ -4133,7 +4133,7 @@ "ubW" = ( /obj/structure/table, /obj/item/spacecash/c10, -/obj/item/device/laser_pointer/red, +/obj/item/laser_pointer/red, /turf/simulated/floor/tiled/rust, /area/racers) "ueb" = ( @@ -4199,7 +4199,7 @@ /obj/machinery/computer/ship/helm{ req_access = list(204) }, -/obj/item/device/gps, +/obj/item/gps, /obj/machinery/camera/network/thunder, /turf/simulated/floor/shuttle/red, /area/shuttle/racers_red) @@ -4914,7 +4914,7 @@ "xIf" = ( /obj/structure/table/reinforced/wood, /obj/item/flame/lighter/zippo/gold, -/obj/item/device/megaphone{ +/obj/item/megaphone{ pixel_x = 3; pixel_y = -2 }, diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index b0cf3c377d8..cdf87b971f3 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -425,7 +425,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -474,7 +474,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -681,7 +681,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -692,7 +692,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, @@ -1582,7 +1582,7 @@ dir = 8; req_one_access = list(150) }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/lino, /area/grand_romanovich) "ep" = ( @@ -2128,7 +2128,7 @@ dir = 10 }, /obj/random/pottedplant, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" @@ -2279,7 +2279,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/machinery/vending/casino, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -2447,7 +2447,7 @@ /area/grand_romanovich) "gu" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/wood, /area/grand_romanovich) "gv" = ( @@ -2458,7 +2458,7 @@ /area/grand_romanovich/outdoors) "gw" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/light{ icon_state = "tube_empty" }, @@ -2515,7 +2515,7 @@ "gD" = ( /obj/structure/table/wood, /obj/item/clothing/accessory/badge/hadii_card, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -2566,7 +2566,7 @@ /area/grand_romanovich) "gM" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood{ temperature = 278 }, @@ -2605,7 +2605,7 @@ /area/grand_romanovich) "gT" = ( /obj/structure/table/stone/marble, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/lino, /area/grand_romanovich) "gU" = ( @@ -2619,7 +2619,7 @@ "gV" = ( /obj/structure/table/wood, /obj/item/phone, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/lino, /area/grand_romanovich) "gW" = ( @@ -2916,7 +2916,7 @@ "hM" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, /obj/random/pottedplant, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/wood, /area/grand_romanovich) "hN" = ( @@ -2981,7 +2981,7 @@ dir = 1 }, /obj/structure/bed/stool/chair/wood, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/wood, /area/grand_romanovich) "ib" = ( @@ -3163,7 +3163,7 @@ "iG" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/stone/marble, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/tiled/white, /area/grand_romanovich) "iH" = ( @@ -3341,7 +3341,7 @@ /area/grand_romanovich) "jj" = ( /obj/structure/table/stone/marble, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/wood, /area/grand_romanovich) "jm" = ( @@ -4064,7 +4064,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lL" = ( -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/effect/floor_decal/corner/yellow{ dir = 5; icon_state = "corner_white" @@ -4659,7 +4659,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/wood, /area/grand_romanovich) "nq" = ( @@ -4918,7 +4918,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "nT" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner/yellow{ dir = 6; icon_state = "corner_white" @@ -4987,7 +4987,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "oc" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/effect/floor_decal/corner/yellow{ dir = 10; icon_state = "corner_white" @@ -5253,7 +5253,7 @@ /area/grand_romanovich) "qA" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "qE" = ( @@ -5463,7 +5463,7 @@ /area/grand_romanovich) "uG" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/machinery/light/small{ dir = 8 }, @@ -6201,7 +6201,7 @@ /area/grand_romanovich) "Hv" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/storage/secure/safe{ pixel_x = 32; pixel_y = 32 @@ -6315,7 +6315,7 @@ /area/grand_romanovich) "Jh" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "Jl" = ( @@ -6467,12 +6467,12 @@ icon_state = "corner_white" }, /obj/structure/table/rack, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -6719,7 +6719,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/wood, /area/grand_romanovich) "Pu" = ( @@ -7014,7 +7014,7 @@ icon_state = "tube_empty" }, /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/wood, /area/grand_romanovich) "Ut" = ( @@ -7022,7 +7022,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ on = 1 }, /turf/simulated/floor/wood{ @@ -7034,7 +7034,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ on = 1 }, /turf/simulated/floor/wood{ @@ -7149,7 +7149,7 @@ /area/grand_romanovich) "VM" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, diff --git a/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm b/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm index e179e2ac4e0..2bed625f281 100644 --- a/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm +++ b/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm @@ -26,7 +26,7 @@ back = /obj/item/storage/backpack/satchel/leather id = /obj/item/card/id/away_site - l_ear = /obj/item/device/radio/headset/ship/common + l_ear = /obj/item/radio/headset/ship/common backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1) @@ -61,7 +61,7 @@ id = /obj/item/card/id/away_site - l_ear = /obj/item/device/radio/headset/ship/common + l_ear = /obj/item/radio/headset/ship/common backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1) @@ -98,7 +98,7 @@ id = /obj/item/card/id/away_site - l_ear = /obj/item/device/radio/headset/ship/common + l_ear = /obj/item/radio/headset/ship/common backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/box/handcuffs = 1) @@ -110,7 +110,7 @@ /obj/item/reagent_containers/spray/pepper = 1, /obj/item/melee/baton/loaded = 1, /obj/item/grenade/chem_grenade/gas = 1, - /obj/item/device/flash = 1, + /obj/item/flash = 1, /obj/item/ammo_magazine/mc9mm = 2 ) @@ -135,6 +135,6 @@ respawn_flag = null /obj/outfit/admin/random/casino_patron - l_ear = /obj/item/device/radio/headset/ship/common + l_ear = /obj/item/radio/headset/ship/common backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/storage/bag/money/casino = 1) diff --git a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm index a7d56ec0ff7..eb3168c65ce 100644 --- a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm +++ b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint.dmm @@ -189,12 +189,12 @@ dir = 1 }, /obj/random/dirt_75, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, /turf/simulated/floor/tiled/dark, /area/hegemony_waypoint/hallway) "dm" = ( @@ -429,7 +429,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /turf/simulated/floor/tiled/dark, /area/hegemony_waypoint/hallway) "it" = ( @@ -1005,7 +1005,7 @@ dir = 6 }, /obj/random/dirt_75, -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /turf/simulated/floor/tiled/dark, /area/hegemony_waypoint/hallway) "up" = ( @@ -1657,8 +1657,8 @@ /area/hegemony_waypoint/engineering) "Gl" = ( /obj/structure/table/steel, -/obj/item/device/radio/intercom/hailing/east, -/obj/item/device/radio/hailing{ +/obj/item/radio/intercom/hailing/east, +/obj/item/radio/hailing{ pixel_y = 4; pixel_x = -9 }, diff --git a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm index 61c671c1d5d..f833f80ec60 100644 --- a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm +++ b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm @@ -217,7 +217,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 11; pixel_x = -4 }, @@ -652,7 +652,7 @@ dir = 5 }, /obj/random/dirt_75, -/obj/item/device/versebook/thakh{ +/obj/item/versebook/thakh{ pixel_y = 6; pixel_x = 3 }, @@ -1955,7 +1955,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/device/versebook/thakh{ +/obj/item/versebook/thakh{ pixel_y = 6; pixel_x = 3 }, @@ -1974,7 +1974,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/device/versebook/skakh{ +/obj/item/versebook/skakh{ pixel_x = 5; pixel_y = 9 }, @@ -2246,7 +2246,7 @@ pixel_x = -10; pixel_y = 16 }, -/obj/item/device/versebook/skakh{ +/obj/item/versebook/skakh{ pixel_x = 4; pixel_y = 7 }, @@ -2697,7 +2697,7 @@ pixel_y = -12; pixel_x = 3 }, -/obj/item/device/personal_shield{ +/obj/item/personal_shield{ pixel_y = 4; pixel_x = 8 }, @@ -2792,7 +2792,7 @@ }, /obj/random/dirt_75, /obj/effect/decal/cleanable/ash, -/obj/item/device/oxycandle{ +/obj/item/oxycandle{ pixel_y = 7; pixel_x = -5 }, @@ -2833,7 +2833,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 11; pixel_x = -4 }, diff --git a/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dmm b/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dmm index 2d96b875063..3cd2eb3c0ad 100644 --- a/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dmm +++ b/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dmm @@ -267,7 +267,7 @@ /area/sensor_relay) "aat" = ( /obj/effect/floor_decal/industrial/warning, -/obj/item/device/radio/intercom/ship/north, +/obj/item/radio/intercom/ship/north, /turf/simulated/floor/airless, /area/sensor_relay) "aau" = ( @@ -1458,7 +1458,7 @@ }, /obj/machinery/meter, /obj/effect/decal/cleanable/floor_damage/random_tiled_broken, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -12 }, /obj/machinery/power/portgen/basic, @@ -1508,7 +1508,7 @@ /turf/simulated/floor/tiled/dark, /area/sensor_relay/workshop) "axF" = ( -/obj/item/device/oxycandle{ +/obj/item/oxycandle{ pixel_y = 7; pixel_x = -5 }, @@ -1521,7 +1521,7 @@ /obj/structure/closet, /obj/random/bandana, /obj/item/gun/energy/blaster, -/obj/item/device/personal_shield, +/obj/item/personal_shield, /obj/item/inflatable/wall, /obj/item/clothing/under/service_overalls, /obj/item/clothing/under/service_overalls, @@ -1573,7 +1573,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/device/oxycandle{ +/obj/item/oxycandle{ pixel_y = 7; pixel_x = 3 }, @@ -1789,7 +1789,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/item/device/radio/intercom/ship/south, +/obj/item/radio/intercom/ship/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1; level = 2 @@ -2082,7 +2082,7 @@ dir = 1 }, /obj/item/storage/bag/circuits/basic, -/obj/item/device/multitool, +/obj/item/multitool, /obj/random/tech_supply, /obj/item/stack/cable_coil/yellow, /obj/item/cell/high/empty{ @@ -2331,7 +2331,7 @@ dir = 4 }, /obj/random/dirt_75, -/obj/item/device/radio/intercom/ship/south, +/obj/item/radio/intercom/ship/south, /turf/simulated/floor/tiled/full, /area/sensor_relay/dining) "aRK" = ( @@ -2367,7 +2367,7 @@ pixel_y = 8; pixel_x = 12 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_y = 6; pixel_x = -8 }, @@ -2492,7 +2492,7 @@ pixel_x = 1 }, /obj/machinery/power/apc/empty/east, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_y = 4; pixel_x = -10 }, @@ -2537,7 +2537,7 @@ /obj/machinery/fabricator/autolathe, /obj/effect/decal/cleanable/cobweb, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/item/device/radio/intercom/ship/west, +/obj/item/radio/intercom/ship/west, /obj/structure/sign/nosmoking_1{ pixel_y = 27 }, @@ -2552,7 +2552,7 @@ /obj/item/storage/bag/inflatable{ pixel_y = 2 }, -/obj/item/device/radio/intercom/ship/north, +/obj/item/radio/intercom/ship/north, /turf/simulated/floor/carpet/rubber, /area/sensor_relay/monitoring) "aYf" = ( @@ -2613,7 +2613,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, -/obj/item/device/radio/intercom/ship/east, +/obj/item/radio/intercom/ship/east, /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/sensor_relay) @@ -2888,7 +2888,7 @@ icon_state = "4-8" }, /obj/structure/lattice/catwalk/indoor, -/obj/item/device/radio/intercom/ship/north, +/obj/item/radio/intercom/ship/north, /turf/simulated/floor/airless, /area/sensor_relay) "dWa" = ( @@ -3770,7 +3770,7 @@ dir = 9 }, /obj/random/dirt_75, -/obj/item/device/radio/intercom/ship/west, +/obj/item/radio/intercom/ship/west, /turf/simulated/floor/tiled, /area/sensor_relay) "sEV" = ( diff --git a/maps/away/away_site/shady/shady.dmm b/maps/away/away_site/shady/shady.dmm index c7591fa39bd..6d5d168b88d 100644 --- a/maps/away/away_site/shady/shady.dmm +++ b/maps/away/away_site/shady/shady.dmm @@ -1512,7 +1512,7 @@ /area/hideout) "vA" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/tiled, /area/hideout) "vF" = ( @@ -2099,7 +2099,7 @@ "Gg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/steel, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/tiled, /area/hideout) "Gi" = ( diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm index 7349b89b3dd..cd2e1e035e1 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm @@ -164,7 +164,7 @@ /area/mining_jack_outpost/smelter) "cq" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/button/distress{ dir = 1; pixel_y = -32 @@ -821,7 +821,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/rust{ temperature = 278.15 }, @@ -1092,7 +1092,7 @@ /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, /obj/machinery/light, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/rust{ temperature = 278.15 }, @@ -1263,9 +1263,9 @@ }, /area/mining_jack_outpost/hangar) "tx" = ( -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/structure/closet/toolcloset/empty, /obj/item/ore_detector, /obj/item/ore_detector, @@ -1552,9 +1552,9 @@ /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack_ghostroles.dm b/maps/away/away_site/tajara/mining_jack/mining_jack_ghostroles.dm index 8fc0a026d44..e9e5265455c 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack_ghostroles.dm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack_ghostroles.dm @@ -42,7 +42,7 @@ /obj/item/storage/backpack/messenger/engi ) - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship id = /obj/item/card/id diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index c8290e7a238..39ef000a621 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -919,11 +919,11 @@ /area/peoples_station/hangar) "dA" = ( /obj/structure/closet/cabinet, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, /obj/item/ammo_magazine/a50, /obj/item/ammo_magazine/a50, /turf/simulated/floor/wood, @@ -1477,7 +1477,7 @@ /area/peoples_station/hangar) "fq" = ( /obj/structure/table/steel, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -1748,7 +1748,7 @@ /obj/machinery/atmospherics/portables_connector/aux{ dir = 8 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "PEOPLE"; gpstag = "PEOPLEFANG"; pixel_y = 28; @@ -2383,7 +2383,7 @@ /obj/effect/floor_decal/corner_wide/red{ dir = 1 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "PEOPLE"; gpstag = "PEOPLESTATION"; pixel_y = 28; @@ -3724,7 +3724,7 @@ /area/peoples_station/armory) "no" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/art, /area/peoples_station/captain_quarters) "nq" = ( @@ -4277,9 +4277,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -4346,7 +4346,7 @@ pixel_y = 6; pixel_x = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 8; pixel_x = -6 }, @@ -4405,7 +4405,7 @@ /obj/item/clothing/head/tajaran/cosmonaut_commissar, /obj/item/clothing/accessory/holster/hip, /obj/item/storage/backpack/satchel/leather, -/obj/item/device/radio/headset/ship, +/obj/item/radio/headset/ship, /obj/item/clothing/accessory/badge/pra_passport, /turf/simulated/floor/carpet/art, /area/peoples_station/commissar_quarters) @@ -5535,7 +5535,7 @@ /obj/item/clothing/shoes/combat, /obj/item/clothing/under/tajaran/cosmonaut, /obj/item/storage/backpack/satchel/leather, -/obj/item/device/radio/headset/ship, +/obj/item/radio/headset/ship, /obj/structure/sign/flag/pra{ pixel_y = -32 }, @@ -5577,7 +5577,7 @@ /obj/item/reagent_containers/food/drinks/bottle/victorygin, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /turf/simulated/floor/carpet/art, /area/peoples_station/captain_quarters) "uq" = ( @@ -6008,7 +6008,7 @@ /area/peoples_station) "vX" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood{ temperature = 278.15 }, @@ -6766,7 +6766,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "PEOPLE"; gpstag = "PEOPLETRANSPORT"; pixel_x = 22; @@ -6780,7 +6780,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -7039,7 +7039,7 @@ /area/peoples_station) "zZ" = ( /obj/structure/table/steel, -/obj/item/device/camera, +/obj/item/camera, /obj/item/handcuffs, /obj/machinery/light{ dir = 1 @@ -8307,7 +8307,7 @@ pixel_y = 6; pixel_x = 8 }, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -8556,19 +8556,19 @@ /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, @@ -9401,7 +9401,7 @@ "Jz" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -9411,7 +9411,7 @@ /area/peoples_station/bridge) "JB" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -9912,19 +9912,19 @@ /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/machinery/light, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "PEOPLE"; gpstag = "PEOPLE0" }, @@ -12917,7 +12917,7 @@ /area/peoples_station/transport_hangar) "Xp" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/art, /area/peoples_station/commissar_quarters) "Xq" = ( @@ -12980,7 +12980,7 @@ /obj/item/clothing/head/tajaran/orbital_captain, /obj/item/clothing/accessory/holster/hip, /obj/item/storage/backpack/satchel/leather, -/obj/item/device/radio/headset/ship, +/obj/item/radio/headset/ship, /obj/item/clothing/accessory/badge/pra_passport, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm b/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm index 75c0e2c04c3..6b8201066ca 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station_ghostroles.dm @@ -27,7 +27,7 @@ shoes = /obj/item/clothing/shoes/jackboots/tajara uniform = /obj/item/clothing/under/tajaran/cosmonaut - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship belt = /obj/item/storage/belt/military @@ -108,5 +108,5 @@ /obj/item/storage/box/hadii_manifesto = 1, /obj/item/storage/box/hadii_card = 1 ) - l_hand = /obj/item/device/megaphone + l_hand = /obj/item/megaphone r_hand = /obj/item/martial_manual/tajara diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm index 644c4d283f2..2cdafb7027b 100644 --- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm +++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm @@ -117,7 +117,7 @@ /area/pra_satellite) "be" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -1624,7 +1624,7 @@ /area/pra_satellite) "JL" = ( /obj/structure/table/wood, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /turf/simulated/floor/wood{ temperature = 278.15 }, @@ -2020,7 +2020,7 @@ /area/pra_satellite) "Xt" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8; level = 2 diff --git a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm index eef79c1fe9f..03db6f949e5 100644 --- a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm +++ b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm @@ -1282,14 +1282,14 @@ /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/plating/cooled, /area/saniorios_outpost) "rw" = ( @@ -1662,7 +1662,7 @@ }, /obj/structure/closet/crate/internals, /obj/item/storage/bag/inflatable, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/tank/emergency_oxygen{ pixel_x = 5 }, @@ -1774,7 +1774,7 @@ /area/saniorios_outpost/crew_section) "yS" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/ears/earmuffs, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -3347,7 +3347,7 @@ /area/saniorios_outpost) "Yj" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled{ temperature = 278.15 }, diff --git a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost_ghostroles.dm b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost_ghostroles.dm index e3ba6e7212e..ac71e54559b 100644 --- a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost_ghostroles.dm +++ b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost_ghostroles.dm @@ -26,7 +26,7 @@ shoes = /obj/item/clothing/shoes/jackboots/tajara uniform = /obj/item/clothing/under/tajaran/pvsm - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/rucksack belt = /obj/item/storage/belt/military diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm index 60eb8a997fa..ad98f47593a 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dmm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm @@ -591,7 +591,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/mask/breath, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -869,7 +869,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/mask/breath, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2165,7 +2165,7 @@ /obj/effect/floor_decal/corner/beige{ dir = 10 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/shuttle/scrapper_ship/bridge) "zx" = ( @@ -2361,7 +2361,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/mask/breath, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor/plating{ temperature = 278.15 }, diff --git a/maps/away/away_site/tajara/scrapper/scrapper_ghostroles.dm b/maps/away/away_site/tajara/scrapper/scrapper_ghostroles.dm index 53a091157aa..d49c4f08b9c 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper_ghostroles.dm +++ b/maps/away/away_site/tajara/scrapper/scrapper_ghostroles.dm @@ -41,7 +41,7 @@ /obj/item/storage/backpack/duffel ) - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship id = /obj/item/card/id diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm index e932570323f..24dc2d352fd 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm @@ -47,7 +47,7 @@ /area/tajara_safehouse) "bg" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse/hangar) "bt" = ( @@ -70,11 +70,11 @@ /area/tajara_safehouse) "bO" = ( /obj/structure/closet/crate, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) "bP" = ( @@ -523,7 +523,7 @@ "pF" = ( /obj/structure/table/wood, /obj/item/material/knife/bayonet, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) "pL" = ( @@ -841,8 +841,8 @@ /obj/structure/closet/cabinet, /obj/item/storage/firstaid, /obj/item/storage/firstaid, -/obj/item/device/megaphone, -/obj/item/device/binoculars, +/obj/item/megaphone, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) "zP" = ( @@ -1012,7 +1012,7 @@ /area/shuttle/tajara_safehouse_shuttle) "Hp" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/tajara_safehouse) "Hr" = ( diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm index 9bb2e88c856..7b52dcc7738 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse_ghostroles.dm @@ -83,6 +83,6 @@ id = null - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1, /obj/item/gun/projectile/silenced = 1, /obj/item/ammo_magazine/c45m = 2) diff --git a/maps/away/away_site/treasure_trove/treasure_trove.dmm b/maps/away/away_site/treasure_trove/treasure_trove.dmm index 9ab2ac82a0e..a81c07f5530 100644 --- a/maps/away/away_site/treasure_trove/treasure_trove.dmm +++ b/maps/away/away_site/treasure_trove/treasure_trove.dmm @@ -57,7 +57,7 @@ /area/trove/vault) "ap" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/plating/asteroid, /area/trove/vault) "aq" = ( @@ -520,7 +520,7 @@ /area/trove/vault) "de" = ( /obj/random/dirt_75, -/obj/item/device/personal_shield, +/obj/item/personal_shield, /obj/item/rig/unathi/fancy/equipped, /obj/item/melee/energy/glaive, /turf/simulated/floor/carpet/red, @@ -1807,7 +1807,7 @@ /area/trove/tunnels) "jN" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/barren/cave, /area/trove/vault) "jP" = ( @@ -3132,7 +3132,7 @@ }, /obj/effect/decal/cleanable/vomit, /obj/random/dirt_75, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/wood/mahogany, /area/trove/vault) "rg" = ( @@ -3462,8 +3462,8 @@ req_one_access = list(229, 217) }, /obj/effect/floor_decal/industrial/outline/custodial, -/obj/item/device/hand_labeler, -/obj/item/device/price_scanner, +/obj/item/hand_labeler, +/obj/item/price_scanner, /obj/random/dirt_75, /turf/simulated/floor/marble/dark, /area/trove/vault) @@ -3698,7 +3698,7 @@ /turf/simulated/floor/tiled/dark/full, /area/trove/vault) "uZ" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/wood/walnut, /area/trove/beach) "vf" = ( @@ -3824,7 +3824,7 @@ "vK" = ( /obj/random/dirt_75, /obj/effect/decal/cleanable/liquid_fuel, -/obj/item/device/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, /turf/simulated/floor/exoplanet/asphalt, /area/trove/vault) "vL" = ( @@ -4364,7 +4364,7 @@ "zB" = ( /obj/random/dirt_75, /obj/item/gun/bang/pirate, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/wood/mahogany, /area/trove/vault) "zD" = ( @@ -5225,7 +5225,7 @@ /obj/structure/bed/handrail{ dir = 4 }, -/obj/item/device/radio/intercom/hailing/west, +/obj/item/radio/intercom/hailing/west, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/trove/vault) @@ -5476,7 +5476,7 @@ /area/trove/vault) "FV" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/unsimulated/floor/carpet, /area/trove/vault) "FW" = ( @@ -5715,8 +5715,8 @@ "GN" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/reinforced/steel, -/obj/item/device/radio/intercom/hailing/north, -/obj/item/device/radio/hailing{ +/obj/item/radio/intercom/hailing/north, +/obj/item/radio/hailing{ pixel_x = 5; pixel_y = 6 }, @@ -5830,7 +5830,7 @@ /area/trove/vault) "Hr" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/wood/mahogany, /area/trove/vault) "Hs" = ( @@ -6476,8 +6476,8 @@ }, /obj/item/stack/material/steel/full, /obj/item/stack/rods/full, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, /obj/item/storage/bag/inflatable, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -6593,7 +6593,7 @@ /turf/simulated/floor/wood, /area/trove/vault) "LN" = ( -/obj/item/device/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, /obj/effect/decal/cleanable/floor_damage/random_burned, /turf/simulated/floor/exoplanet/barren, /area/trove/beach) @@ -8253,7 +8253,7 @@ "UI" = ( /obj/structure/table/wood/gamblingtable, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/wood/mahogany, /area/trove/vault) "UJ" = ( diff --git a/maps/away/away_site/treasure_trove/treasure_trove_submaps.dmm b/maps/away/away_site/treasure_trove/treasure_trove_submaps.dmm index 95b655c3a5b..74a167484c4 100644 --- a/maps/away/away_site/treasure_trove/treasure_trove_submaps.dmm +++ b/maps/away/away_site/treasure_trove/treasure_trove_submaps.dmm @@ -95,7 +95,7 @@ }, /area/trove/tunnels) "bG" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /obj/structure/platform_deco/ledge{ dir = 8 }, @@ -125,7 +125,7 @@ /turf/simulated/floor/exoplanet/basalt/cave, /area/trove/tunnels) "cl" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/concrete/square, /area/trove/tunnels) "cn" = ( @@ -228,7 +228,7 @@ /area/trove/tunnels) "el" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/barren, /area/trove/tunnels) "em" = ( @@ -1010,7 +1010,7 @@ /obj/structure/sign/radiation{ pixel_y = 32 }, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/exoplanet/basalt/cave, /area/trove/tunnels) "qM" = ( @@ -1105,7 +1105,7 @@ /turf/simulated/floor/exoplanet/asphalt, /area/trove/tunnels) "rY" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/wood/mahogany, /area/trove/tunnels) "sb" = ( @@ -2066,7 +2066,7 @@ /area/trove/tunnels) "Ia" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/grass, /area/trove/tunnels) "If" = ( @@ -3193,7 +3193,7 @@ /turf/simulated/open, /area/trove/tunnels) "Zb" = ( -/obj/item/device/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, /obj/random/dirt_75, /turf/simulated/floor/exoplanet/basalt/cave, /area/trove/tunnels) diff --git a/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm b/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm index e97baa51446..7ae70d029f5 100644 --- a/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm +++ b/maps/away/away_site/uueoaesa/omgolo/omgolo_tourist.dmm @@ -2442,7 +2442,7 @@ /area/omgolo_tourist/room3) "aRv" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/red, /area/omgolo_tourist/room1) "aRx" = ( @@ -2712,7 +2712,7 @@ "aVY" = ( /obj/structure/table/wood, /obj/random/spacecash, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/red, /area/omgolo_tourist/room2) "aVZ" = ( @@ -2904,7 +2904,7 @@ /area/omgolo_tourist/room2) "aZZ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/red, /area/omgolo_tourist/room3) "baC" = ( diff --git a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm index d98244e74af..816918f35aa 100644 --- a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm +++ b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm @@ -284,11 +284,11 @@ /area/ihss_reclamation/southhall) "bl" = ( /obj/structure/table/rack, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/storage) "bn" = ( @@ -1385,28 +1385,28 @@ "gR" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 6; gpstag = "SCC12" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 8; gpstag = "SCC11" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = -6; gpstag = "SCC13" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = -8; gpstag = "SCC14" }, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/storage) "gU" = ( @@ -1673,7 +1673,7 @@ /obj/item/gun/energy/net, /obj/item/gun/energy/laser/shotgun, /obj/item/gun/energy/laser/shotgun, -/obj/item/device/dociler, +/obj/item/dociler, /turf/simulated/floor/tiled/white{ temperature = 303.15 }, @@ -2879,7 +2879,7 @@ /area/ihss_reclamation/medsci) "ox" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/storage/bag/inflatable, /obj/effect/floor_decal/corner/red/diagonal{ dir = 4; @@ -3278,7 +3278,7 @@ /area/ihss_reclamation/solars) "pX" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/research) "pY" = ( @@ -3685,11 +3685,11 @@ /area/ihss_reclamation/armoryfoyer) "sj" = ( /obj/structure/table/rack, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/storage) "sl" = ( @@ -3949,7 +3949,7 @@ /obj/item/clothing/gloves/latex/unathi, /obj/item/clothing/gloves/latex/vaurca, /obj/item/clothing/gloves/latex/vaurca, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/white{ temperature = 303.15 }, @@ -3972,7 +3972,7 @@ /obj/item/autopsy_scanner{ pixel_x = -11 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 11; pixel_y = 12 }, @@ -6478,7 +6478,7 @@ }, /obj/structure/window/reinforced, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red{ color = "#941307"; dir = 10 @@ -6520,7 +6520,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/research) "Gg" = ( @@ -6618,7 +6618,7 @@ dir = 9 }, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/white{ temperature = 303.15 }, @@ -8901,7 +8901,7 @@ pixel_x = -8; pixel_y = -6 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/corner/mauve{ dir = 9 }, @@ -9123,7 +9123,7 @@ /obj/item/clothing/gloves/latex/unathi, /obj/item/clothing/gloves/latex/vaurca, /obj/item/clothing/gloves/latex/vaurca, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/machinery/light{ dir = 4 }, @@ -9929,11 +9929,11 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/machinery/recharger{ pixel_x = -6; pixel_y = 6 @@ -10458,7 +10458,7 @@ "Yo" = ( /obj/structure/window/reinforced, /obj/structure/table/standard, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony, /turf/simulated/floor/tiled/dark, /area/ihss_reclamation/bridge) diff --git a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm index c9727d273d1..e32663d12c1 100644 --- a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm +++ b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm @@ -23,7 +23,7 @@ id = /obj/item/card/id shoes = /obj/item/clothing/shoes/sandals/caligae/socks uniform = /obj/item/clothing/under/unathi - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship r_pocket = /obj/item/storage/wallet/random /obj/outfit/admin/ihss_reclamation/get_id_access() @@ -39,7 +39,7 @@ H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) H.update_body() if(H.is_diona()) - H.equip_or_collect(new /obj/item/device/uv_light, slot_in_backpack) + H.equip_or_collect(new /obj/item/uv_light, slot_in_backpack) /datum/ghostspawner/human/ihss_reclamation/security short_name = "ihss_security" diff --git a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm index b25ffeb075f..05978e657e3 100644 --- a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm +++ b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm @@ -1003,7 +1003,7 @@ /obj/effect/floor_decal/industrial/outline_straight/grey{ dir = 8 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -9; pixel_y = 4 }, @@ -3169,7 +3169,7 @@ /area/tret_industrial/outside/surface) "asG" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -9; pixel_y = 6 }, @@ -4649,8 +4649,8 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/clothing/gloves/botanic_leather/vaurca, /obj/item/clothing/gloves/botanic_leather/vaurca, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/slate, /area/tret_industrial/inside/botany) "aFu" = ( @@ -5127,11 +5127,11 @@ "aJi" = ( /obj/structure/table/reinforced/steel, /obj/machinery/light/colored/decayed/dimmed, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -3; pixel_y = 6 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = 4; pixel_y = 5 }, @@ -5358,7 +5358,7 @@ /obj/item/folder/yellow{ pixel_y = 2 }, -/obj/item/device/radio/intercom/hailing/north, +/obj/item/radio/intercom/hailing/north, /turf/simulated/floor/tiled/slate, /area/tret_industrial/inside/comms) "aLb" = ( @@ -8005,8 +8005,8 @@ /obj/effect/floor_decal/industrial/outline_straight/red{ dir = 4 }, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled/dark, /area/shuttle/tret_industrial/main) "flS" = ( @@ -8401,7 +8401,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/crew) "gxE" = ( -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_x = -14; pixel_y = -12 }, @@ -8448,7 +8448,7 @@ /turf/simulated/floor/tiled/dark, /area/tret_industrial/inside/hallway_docks) "gLk" = ( -/obj/item/device/radio/intercom/hailing/north, +/obj/item/radio/intercom/hailing/north, /obj/machinery/computer/ship/helm/terminal{ dir = 8 }, @@ -8706,11 +8706,11 @@ "hCb" = ( /obj/machinery/light/small/emergency, /obj/structure/table/steel, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -3; pixel_y = 6 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = 4; pixel_y = 5 }, @@ -9505,7 +9505,7 @@ /area/shuttle/tret_industrial/main) "kqB" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3; pixel_y = 3 }, @@ -10493,7 +10493,7 @@ /obj/machinery/light/small/emergency{ dir = 8 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -5; pixel_y = 10 }, @@ -12522,7 +12522,7 @@ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 5; pixel_y = 6 }, @@ -12820,7 +12820,7 @@ /turf/simulated/floor/plating, /area/tret_industrial/inside/hallway_comms) "wLH" = ( -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -9; pixel_y = 4 }, @@ -13015,7 +13015,7 @@ "xES" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -5; pixel_y = 10 }, diff --git a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm index e2fb8724589..8c9ff2ab244 100644 --- a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm +++ b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm @@ -143,9 +143,9 @@ l_pocket = list(/obj/item/reagent_containers/food/snacks/koisbar) id = /obj/item/card/id/hephaestus backpack_contents = list( - /obj/item/device/gps/mining = 1, - /obj/item/device/flashlight/lantern = 1, - /obj/item/device/radio/hailing = 1, + /obj/item/gps/mining = 1, + /obj/item/flashlight/lantern = 1, + /obj/item/radio/hailing = 1, ) /obj/outfit/admin/tret_industrial/get_id_access() diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm index 05e474b2c42..4ced6e762bd 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm @@ -220,7 +220,7 @@ /area/wrecked_nt_ship) "dK" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "dP" = ( @@ -791,7 +791,7 @@ /obj/structure/table/reinforced/steel, /obj/item/mecha_equipment/shield, /obj/item/stack/cable_coil/random, -/obj/item/device/integrated_circuit_printer/upgraded, +/obj/item/integrated_circuit_printer/upgraded, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "qY" = ( @@ -1120,7 +1120,7 @@ /area/wrecked_nt_ship/exterior) "yw" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/vending_refill/seeds, +/obj/item/vending_refill/seeds, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "yK" = ( @@ -1574,7 +1574,7 @@ /area/space) "Kt" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/integrated_circuit_printer/upgraded, +/obj/item/integrated_circuit_printer/upgraded, /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Lb" = ( @@ -1893,7 +1893,7 @@ /area/wrecked_nt_ship) "Sw" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/integrated_circuit_printer/upgraded, +/obj/item/integrated_circuit_printer/upgraded, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "SE" = ( diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm b/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm index 1192db71209..2a6f4f179a2 100644 --- a/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm +++ b/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm @@ -607,7 +607,7 @@ /area/cryo_outpost/inside/labs_cryo_pods) "aFL" = ( /obj/structure/table/standard, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -2; pixel_y = 4 }, @@ -1235,7 +1235,7 @@ /turf/simulated/floor/tiled/dark, /area/cryo_outpost/inside/habitation_east) "bno" = ( -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 6; pixel_y = -8 }, @@ -2295,7 +2295,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/transfer_valve{ +/obj/item/transfer_valve{ pixel_x = -2 }, /turf/simulated/floor/plating, @@ -2573,7 +2573,7 @@ dir = 1 }, /obj/structure/closet/toolcloset, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/stack/cable_coil, /turf/simulated/floor/plating, /area/cryo_outpost/inside/engi_powergen) @@ -3648,7 +3648,7 @@ "ecj" = ( /obj/structure/closet/toolcloset, /obj/effect/floor_decal/industrial/outline/engineering, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/stack/cable_coil, /obj/outfit/admin/generic/engineer, /obj/item/clothing/accessory/storage/pouches/brown, @@ -4825,7 +4825,7 @@ /area/cryo_outpost/outside/surface) "fnR" = ( /obj/structure/table/steel, -/obj/item/device/cratescanner{ +/obj/item/cratescanner{ pixel_x = -6; pixel_y = 2 }, @@ -5856,7 +5856,7 @@ /turf/simulated/floor/tiled/dark, /area/cryo_outpost/inside/engineering) "gsv" = ( -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 13; pixel_y = -12 }, @@ -6873,7 +6873,7 @@ /obj/item/handcuffs, /obj/item/clothing/glasses/sunglasses/aviator, /obj/effect/floor_decal/corner/blue/diagonal, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/machinery/alarm/north{ req_one_access = null }, @@ -7184,7 +7184,7 @@ /area/cryo_outpost/inside/labs_offices) "hZR" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/marshallingwand{ +/obj/item/flashlight/marshallingwand{ pixel_x = -10; pixel_y = 7 }, @@ -7518,7 +7518,7 @@ "ixX" = ( /obj/structure/table/steel, /obj/item/wrench, -/obj/item/device/pipe_painter{ +/obj/item/pipe_painter{ pixel_x = 2; pixel_y = 4 }, @@ -8276,7 +8276,7 @@ "jtp" = ( /obj/structure/table/glass, /obj/effect/floor_decal/corner/pink/diagonal, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 3; pixel_y = 5 }, @@ -9097,7 +9097,7 @@ /turf/simulated/floor/wood, /area/cryo_outpost/inside/canteen) "kkz" = ( -/obj/item/device/flashlight/marshallingwand{ +/obj/item/flashlight/marshallingwand{ pixel_x = 4; pixel_y = 12 }, @@ -9572,7 +9572,7 @@ /turf/simulated/floor/tiled, /area/cryo_outpost/inside/canteen) "kHw" = ( -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 4; pixel_y = 5 }, @@ -9829,11 +9829,11 @@ /area/cryo_outpost/inside/hallway_central) "kWt" = ( /obj/random/dirt_75, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_x = 12; pixel_y = -9 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -3; pixel_y = 6 }, @@ -10199,7 +10199,7 @@ /area/cryo_outpost/inside/canteen) "lml" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -5; pixel_y = 6 }, @@ -10267,7 +10267,7 @@ /area/cryo_outpost/inside/maint_botany) "lrc" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 3; pixel_y = 2 }, @@ -10591,7 +10591,7 @@ /obj/structure/closet/crate/rad/gear, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/plating, /area/cryo_outpost/inside/engineering) "lKz" = ( @@ -10844,7 +10844,7 @@ /area/cryo_outpost/inside/labs_maint_w) "mbi" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 4; pixel_y = 8 }, @@ -11780,7 +11780,7 @@ "nof" = ( /obj/effect/floor_decal/industrial/outline/service, /obj/random/dirt_75, -/obj/item/device/vending_refill/seeds, +/obj/item/vending_refill/seeds, /turf/simulated/floor/plating, /area/cryo_outpost/inside/botany) "now" = ( @@ -14174,7 +14174,7 @@ /obj/item/storage/box/lights/mixed, /obj/item/reagent_containers/glass/bucket, /obj/item/clothing/gloves/janitor, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -14251,7 +14251,7 @@ pixel_x = -6; pixel_y = -8 }, -/obj/item/device/versebook/assunzione/pocket{ +/obj/item/versebook/assunzione/pocket{ pixel_x = 6; pixel_y = 3 }, @@ -14383,7 +14383,7 @@ /obj/structure/closet, /obj/effect/floor_decal/corner_wide/green/diagonal, /obj/outfit/admin/generic/medical, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/clothing/suit/storage/toggle/labcoat, /turf/simulated/floor/tiled/white, /area/cryo_outpost/inside/medical) @@ -15147,7 +15147,7 @@ /area/cryo_outpost/outside/surface) "qWb" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 18; pixel_y = 7 }, @@ -15368,7 +15368,7 @@ /obj/item/storage/box/lights/mixed, /obj/item/reagent_containers/glass/bucket, /obj/item/clothing/gloves/janitor, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/plating, @@ -15389,7 +15389,7 @@ /area/cryo_outpost/inside/canteen) "rim" = ( /obj/structure/table/wood/maple, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 10; pixel_x = 2 }, @@ -17574,7 +17574,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 4; pixel_y = 8 }, @@ -18322,7 +18322,7 @@ /obj/outfit/admin/generic/engineer, /obj/item/storage/belt/utility/full, /obj/item/clothing/accessory/storage/pouches/brown, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/plating, /area/cryo_outpost/inside/engineering) "uqI" = ( @@ -19106,7 +19106,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/reagent_scanner{ +/obj/item/reagent_scanner{ pixel_x = -3; pixel_y = 5 }, @@ -19919,7 +19919,7 @@ /area/cryo_outpost/inside/labs_hallway) "whs" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/flashlight/marshallingwand{ +/obj/item/flashlight/marshallingwand{ pixel_x = -10; pixel_y = 7 }, @@ -21057,7 +21057,7 @@ /turf/simulated/floor/plating, /area/cryo_outpost/inside/maint_medbay) "xtZ" = ( -/obj/item/device/synthesized_instrument/synthesizer{ +/obj/item/synthesized_instrument/synthesizer{ pixel_y = 4 }, /obj/structure/table/steel, @@ -21455,7 +21455,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline_straight/yellow, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_x = -5; pixel_y = -10 }, diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm b/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm index a4aef3dd0cd..d39dca7647f 100644 --- a/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm +++ b/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm @@ -3,9 +3,9 @@ /obj/outfit/admin/generic/cryo_outpost_crew name = "Desert Oasis Planet Outpost Crew Uniform" - l_ear = /obj/item/device/radio/headset/ship - id = /obj/item/device/radio/headset/syndicate - l_pocket = /obj/item/device/radio/hailing + l_ear = /obj/item/radio/headset/ship + id = /obj/item/radio/headset/syndicate + l_pocket = /obj/item/radio/hailing /obj/outfit/admin/generic/cryo_outpost_crew/get_id_access() return list( @@ -30,7 +30,7 @@ glasses = /obj/item/clothing/glasses/sunglasses/aviator l_pocket = /obj/item/tank/emergency_oxygen/double - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -64,7 +64,7 @@ /obj/item/ammo_magazine/c45m = 1, /obj/item/storage/firstaid/combat = 1, /obj/item/storage/firstaid/adv = 1, - /obj/item/device/healthanalyzer = 1, + /obj/item/healthanalyzer = 1, /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1 ) @@ -109,7 +109,7 @@ /obj/item/ammo_magazine/c45m = 2, /obj/item/handcuffs/ziptie = 1, /obj/item/shield/energy = 1, - /obj/item/device/flashlight/flare = 1, + /obj/item/flashlight/flare = 1, ) // ------------------ merc leader diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost_submaps.dmm b/maps/away/scenarios/cryo_outpost/cryo_outpost_submaps.dmm index 37d061c78b8..baf785ae92e 100644 --- a/maps/away/scenarios/cryo_outpost/cryo_outpost_submaps.dmm +++ b/maps/away/scenarios/cryo_outpost/cryo_outpost_submaps.dmm @@ -1176,7 +1176,7 @@ /area/template_noop) "Gc" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_x = 6; pixel_y = 6 }, @@ -1424,7 +1424,7 @@ /area/template_noop) "Nc" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 5; pixel_y = 7 }, @@ -1480,7 +1480,7 @@ /area/template_noop) "OT" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /turf/simulated/floor/tiled, @@ -1791,7 +1791,7 @@ "WP" = ( /obj/random/dirt_75, /obj/structure/table/wood, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 7; pixel_y = -6 }, @@ -1880,7 +1880,7 @@ /area/template_noop) "YO" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -3; pixel_y = 3 }, diff --git a/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard.dmm b/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard.dmm index 873a37ff8f6..757c20598ad 100644 --- a/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard.dmm +++ b/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard.dmm @@ -1587,7 +1587,7 @@ pixel_x = 6; pixel_y = 11 }, -/obj/item/device/assembly/signaler{ +/obj/item/assembly/signaler{ pixel_x = -9; pixel_y = -4 }, @@ -2327,8 +2327,8 @@ "bGF" = ( /obj/structure/lattice/catwalk/indoor/urban, /obj/structure/table/steel, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor, /area/decrepit_shipyard/engineering_equipment_room) "bHc" = ( @@ -6046,7 +6046,7 @@ /area/decrepit_shipyard/docking_arm) "egD" = ( /obj/structure/table/rack/folding_table, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 5; pixel_y = 12 }, @@ -6968,7 +6968,7 @@ pixel_x = 7; pixel_y = -4 }, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_x = -2; pixel_y = 8 }, @@ -10149,7 +10149,7 @@ pixel_y = 15; pixel_x = 22 }, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_x = 3; pixel_y = 13 }, @@ -11119,7 +11119,7 @@ "hDT" = ( /obj/structure/lattice/catwalk/indoor/urban, /obj/structure/table/rack/folding_table, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/random/pottedplant_small{ pixel_x = -9; pixel_y = 11 @@ -16969,7 +16969,7 @@ pixel_x = -7; pixel_y = -6 }, -/obj/item/device/assembly/igniter{ +/obj/item/assembly/igniter{ pixel_x = 1; pixel_y = 12 }, @@ -19002,7 +19002,7 @@ "mSt" = ( /obj/structure/table/reinforced/steel, /obj/random/dirt_75, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = -6; pixel_y = -2 }, @@ -20437,15 +20437,15 @@ dir = 5 }, /obj/structure/table/reinforced/steel, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 11 }, -/obj/item/device/pipe_painter{ +/obj/item/pipe_painter{ pixel_x = -6; pixel_y = 9 }, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /turf/simulated/floor/tiled/gridded, /area/decrepit_shipyard/main_workshop) "nQk" = ( @@ -21068,7 +21068,7 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/device/pipe_painter, +/obj/item/pipe_painter, /turf/simulated/floor/tiled/gridded, /area/decrepit_shipyard/atmospherics) "oit" = ( @@ -24715,9 +24715,9 @@ "qMm" = ( /obj/structure/lattice/catwalk/indoor/urban, /obj/structure/table/rack, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor, /area/decrepit_shipyard/engineering_equipment_room) "qMR" = ( @@ -33600,7 +33600,7 @@ "xzI" = ( /obj/structure/table/reinforced/steel, /obj/random/dirt_75, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = 7; pixel_y = 6 }, diff --git a/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard_submaps.dmm b/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard_submaps.dmm index a9c8d445f3e..4775ea0d859 100644 --- a/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard_submaps.dmm +++ b/maps/away/scenarios/decrepit_shipyard/decrepit_shipyard_submaps.dmm @@ -869,11 +869,11 @@ /area/shuttle/decrepit_shipyard_shuttle) "qu" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 1; pixel_x = -7 }, @@ -1416,7 +1416,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 9 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 6; pixel_y = -2 }, @@ -1621,7 +1621,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_x = -4 }, /obj/machinery/light/small/decayed{ @@ -2332,7 +2332,7 @@ /area/shuttle/decrepit_shipyard_shuttle) "RT" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 6; pixel_y = -2 }, diff --git a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm index 113bd48fa53..d6387392429 100644 --- a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm +++ b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm @@ -3118,7 +3118,7 @@ /turf/simulated/floor/plating, /area/enviro_testing_facility/inside/operations/fabrication) "kw" = ( -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 6; pixel_y = -8 }, @@ -3897,11 +3897,11 @@ /turf/simulated/floor/plating, /area/enviro_testing_facility/inside/maintenance/center_east) "nm" = ( -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = -3; pixel_y = 13 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 3; pixel_y = 3 }, @@ -5605,7 +5605,7 @@ "sR" = ( /obj/structure/table/rack, /obj/item/melee/telebaton, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/box/handcuffs, /obj/item/handcuffs, /turf/simulated/floor/tiled/dark, @@ -6871,7 +6871,7 @@ /turf/simulated/floor/tiled/dark, /area/enviro_testing_facility/inside/hallway/east) "xo" = ( -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, @@ -7074,7 +7074,7 @@ /turf/simulated/floor/plating, /area/enviro_testing_facility/inside/maintenance/center_far) "xV" = ( -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -3; pixel_y = 3 }, @@ -7624,7 +7624,7 @@ /area/enviro_testing_facility/inside/maintenance/center_east) "zD" = ( /obj/structure/table/steel, -/obj/item/device/cratescanner{ +/obj/item/cratescanner{ pixel_y = 7; pixel_x = -2 }, @@ -7789,7 +7789,7 @@ }, /obj/structure/table/rack, /obj/item/melee/telebaton, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/box/handcuffs, /obj/item/handcuffs, /turf/simulated/floor/tiled/dark, @@ -8701,7 +8701,7 @@ /turf/simulated/floor/tiled/dark, /area/enviro_testing_facility/inside/hallway/east) "Dh" = ( -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 3; pixel_y = 10 }, @@ -10286,7 +10286,7 @@ /obj/machinery/door/firedoor/noid, /obj/structure/table/reinforced/steel, /obj/machinery/door/window/southright, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 1; pixel_y = 12 }, @@ -11874,7 +11874,7 @@ /obj/machinery/alarm/west{ req_one_access = null }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = 4; pixel_y = 8 }, @@ -14715,7 +14715,7 @@ /area/enviro_testing_facility/inside/crew/cryo_2) "Xi" = ( /obj/structure/table/standard, -/obj/item/device/laser_pointer/red{ +/obj/item/laser_pointer/red{ pixel_x = 1; pixel_y = 5 }, @@ -14750,7 +14750,7 @@ /area/enviro_testing_facility/inside/hallway/east) "Xq" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 5; pixel_y = 6 }, diff --git a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm index 78c50ab103e..96163adf43d 100644 --- a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm +++ b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm @@ -60,11 +60,11 @@ /area/template_noop) "abO" = ( /obj/structure/table/steel, -/obj/item/device/electronic_assembly/clam{ +/obj/item/electronic_assembly/clam{ pixel_y = 3; pixel_x = 1 }, -/obj/item/device/electronic_assembly/calc{ +/obj/item/electronic_assembly/calc{ pixel_x = -3; pixel_y = 4 }, @@ -154,7 +154,7 @@ pixel_x = 5; pixel_y = 1 }, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = -2; pixel_y = 11 }, @@ -486,7 +486,7 @@ dir = 4 }, /obj/structure/table/wood/maple, -/obj/item/device/laser_pointer/red{ +/obj/item/laser_pointer/red{ pixel_x = 9; pixel_y = 9 }, @@ -627,11 +627,11 @@ /area/enviro_testing_facility/inside/crew/canteen) "aIf" = ( /obj/structure/table/standard, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/reagent_scanner{ +/obj/item/reagent_scanner{ pixel_x = 9; pixel_y = 6 }, @@ -787,7 +787,7 @@ "aPn" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/item/device/mmi/digital/robot{ +/obj/item/mmi/digital/robot{ pixel_x = 5; pixel_y = 15 }, @@ -1187,7 +1187,7 @@ /area/enviro_testing_facility/inside/research/hallway) "bgB" = ( /obj/structure/table/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 12; pixel_y = 5 }, @@ -2344,11 +2344,11 @@ /area/template_noop) "cnR" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = -3; pixel_y = 8 }, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = 5; pixel_y = 4 }, @@ -2356,7 +2356,7 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = -3 }, /obj/machinery/power/apc/west{ @@ -2380,7 +2380,7 @@ /area/enviro_testing_facility/inside/engineering/secure_storage) "coB" = ( /obj/structure/table/steel, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_y = 8; pixel_x = 4 }, @@ -3105,14 +3105,14 @@ /area/enviro_testing_facility/inside/research/hallway) "dbd" = ( /obj/structure/table/steel, -/obj/item/device/firing_pin/access{ +/obj/item/firing_pin/access{ pixel_x = 6 }, -/obj/item/device/firing_pin/access{ +/obj/item/firing_pin/access{ pixel_x = 9; pixel_y = 5 }, -/obj/item/device/firing_pin/access{ +/obj/item/firing_pin/access{ pixel_x = 16; pixel_y = 10 }, @@ -3320,7 +3320,7 @@ /turf/simulated/floor/tiled, /area/enviro_testing_facility/inside/crew/quarters) "dlE" = ( -/obj/item/device/electronic_assembly/tiny/box{ +/obj/item/electronic_assembly/tiny/box{ pixel_x = 4; pixel_y = 2 }, @@ -3329,11 +3329,11 @@ /area/enviro_testing_facility/inside/research/electronics) "dlF" = ( /obj/structure/table/standard, -/obj/item/device/reagent_scanner{ +/obj/item/reagent_scanner{ pixel_x = 9; pixel_y = 6 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -6; pixel_y = 6 }, @@ -3753,7 +3753,7 @@ /obj/effect/floor_decal/corner/beige{ dir = 5 }, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = -9; pixel_y = 8 }, @@ -3973,7 +3973,7 @@ /area/enviro_testing_facility/inside/engineering/robo_lab) "dRW" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = 4; pixel_y = 11 }, @@ -4371,7 +4371,7 @@ /area/enviro_testing_facility/inside/research/telescience) "erT" = ( /obj/structure/table/steel, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_y = 3; pixel_x = 1 }, @@ -4794,7 +4794,7 @@ "eLz" = ( /obj/structure/table/steel, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -3 }, /turf/simulated/floor/tiled, @@ -5636,8 +5636,8 @@ /obj/item/gun/energy/stunrevolver, /obj/item/melee/telebaton, /obj/item/handcuffs, -/obj/item/device/flash, -/obj/item/device/flashlight/maglight, +/obj/item/flash, +/obj/item/flashlight/maglight, /obj/effect/floor_decal/industrial/outline/security, /obj/item/storage/box/handcuffs, /obj/item/reagent_containers/spray/pepper, @@ -5701,7 +5701,7 @@ /area/enviro_testing_facility/inside/engineering/reactors) "fJM" = ( /obj/structure/table/steel, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_x = -15; pixel_y = 7 }, @@ -5985,7 +5985,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 10 }, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_x = -7 }, /obj/machinery/alarm/south{ @@ -6296,10 +6296,10 @@ /obj/effect/floor_decal/corner/pink{ dir = 1 }, -/obj/item/device/electronic_assembly/pda{ +/obj/item/electronic_assembly/pda{ pixel_y = 4 }, -/obj/item/device/electronic_assembly/medium/gun{ +/obj/item/electronic_assembly/medium/gun{ pixel_y = 4; pixel_x = 14 }, @@ -6975,8 +6975,8 @@ /obj/item/gun/energy/stunrevolver, /obj/item/melee/telebaton, /obj/item/handcuffs, -/obj/item/device/flash, -/obj/item/device/flashlight/maglight, +/obj/item/flash, +/obj/item/flashlight/maglight, /obj/effect/floor_decal/industrial/outline/security, /obj/item/storage/box/handcuffs, /obj/item/reagent_containers/spray/pepper, @@ -8626,7 +8626,7 @@ /obj/effect/floor_decal/corner/pink{ dir = 6 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -11; pixel_y = 1 }, @@ -8724,7 +8724,7 @@ /turf/simulated/floor/tiled/dark, /area/enviro_testing_facility/inside/security/lobby) "iFZ" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/basalt, /area/template_noop) "iGa" = ( @@ -9172,7 +9172,7 @@ /area/enviro_testing_facility/inside/engineering/reactors) "jdE" = ( /obj/structure/table/steel, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_x = 3; pixel_y = 4 }, @@ -9811,7 +9811,7 @@ /turf/simulated/floor/tiled/light, /area/enviro_testing_facility/inside/research/entrance) "jPu" = ( -/obj/item/device/electronic_assembly/drone, +/obj/item/electronic_assembly/drone, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -9963,7 +9963,7 @@ pixel_y = -11; pixel_x = -2 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 9; pixel_y = 5 }, @@ -10768,7 +10768,7 @@ /area/template_noop) "kIw" = ( /obj/structure/table/steel, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = 8; pixel_y = 11 }, @@ -11028,7 +11028,7 @@ /area/enviro_testing_facility/inside/crew/quarters) "kXn" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -1; pixel_y = 3 }, @@ -11154,7 +11154,7 @@ /area/enviro_testing_facility/inside/engineering/equipment) "ldX" = ( /obj/structure/table/steel, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_x = 9 }, /turf/simulated/floor/tiled/dark, @@ -11382,8 +11382,8 @@ /obj/item/gun/energy/stunrevolver, /obj/item/melee/telebaton, /obj/item/handcuffs, -/obj/item/device/flash, -/obj/item/device/flashlight/maglight, +/obj/item/flash, +/obj/item/flashlight/maglight, /obj/item/storage/box/handcuffs, /obj/item/reagent_containers/spray/pepper, /obj/item/storage/belt/security, @@ -11727,7 +11727,7 @@ /area/enviro_testing_facility/inside/engineering/equipment) "lKT" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_x = -2; pixel_y = 8 }, @@ -12108,7 +12108,7 @@ /obj/effect/floor_decal/corner/orange{ dir = 6 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 9 }, @@ -12330,8 +12330,8 @@ /obj/item/gun/energy/stunrevolver, /obj/item/melee/telebaton, /obj/item/handcuffs, -/obj/item/device/flash, -/obj/item/device/flashlight/maglight, +/obj/item/flash, +/obj/item/flashlight/maglight, /obj/effect/floor_decal/industrial/outline/security, /obj/item/storage/box/handcuffs, /obj/machinery/light{ @@ -12535,7 +12535,7 @@ /area/enviro_testing_facility/inside/engineering/mech_lab) "mEm" = ( /obj/structure/table/standard, -/obj/item/device/mmi{ +/obj/item/mmi{ pixel_x = -1; pixel_y = 5 }, @@ -12677,7 +12677,7 @@ /area/template_noop) "mJP" = ( /obj/structure/table/standard, -/obj/item/device/mmi/digital/robot{ +/obj/item/mmi/digital/robot{ pixel_x = -4; pixel_y = -2 }, @@ -13041,11 +13041,11 @@ "nhn" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/pink, -/obj/item/device/assembly/electronic_assembly{ +/obj/item/assembly/electronic_assembly{ pixel_x = -5; pixel_y = -5 }, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = 7; pixel_y = 3 }, @@ -13419,15 +13419,15 @@ /area/enviro_testing_facility/inside/engineering/reactors) "nzH" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = -8; pixel_y = -2 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/light/small{ dir = 8 }, @@ -13480,8 +13480,8 @@ /area/template_noop) "nDq" = ( /obj/structure/table/standard, -/obj/item/device/memorywiper, -/obj/item/device/memorywiper{ +/obj/item/memorywiper, +/obj/item/memorywiper{ pixel_y = -7; pixel_x = 2 }, @@ -13849,7 +13849,7 @@ "nTD" = ( /obj/structure/lattice/catwalk/indoor/planks, /obj/structure/table/rack/cafe_table, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_x = 3; pixel_y = 4 }, @@ -13949,7 +13949,7 @@ /area/enviro_testing_facility/inside/control/offices) "nXf" = ( /obj/structure/table/steel, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_x = 4; pixel_y = -3 }, @@ -14169,7 +14169,7 @@ /area/enviro_testing_facility/inside/crew/quarters) "ohK" = ( /obj/structure/table/steel, -/obj/item/device/mmi/digital/robot{ +/obj/item/mmi/digital/robot{ pixel_y = 6; pixel_x = -3 }, @@ -14374,10 +14374,10 @@ /turf/simulated/floor/tiled/dark, /area/enviro_testing_facility/inside/research/electronics) "otM" = ( -/obj/item/device/integrated_electronics/detailer{ +/obj/item/integrated_electronics/detailer{ pixel_x = -3 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = 7; pixel_y = -5 }, @@ -14685,7 +14685,7 @@ "oPL" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/mauve/diagonal, -/obj/item/device/assembly/igniter{ +/obj/item/assembly/igniter{ pixel_x = -2; pixel_y = 4 }, @@ -15073,7 +15073,7 @@ /area/enviro_testing_facility/inside/medical/hallway) "pfs" = ( /obj/structure/table/steel, -/obj/item/device/mmi/digital/posibrain{ +/obj/item/mmi/digital/posibrain{ pixel_y = 8 }, /turf/simulated/floor/carpet/rubber, @@ -16438,7 +16438,7 @@ /obj/effect/floor_decal/corner/beige{ dir = 10 }, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_x = 5 }, /turf/simulated/floor/tiled/white, @@ -16467,7 +16467,7 @@ "qBW" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner_wide/paleblue/diagonal, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -3 }, /obj/machinery/alarm/east{ @@ -16984,7 +16984,7 @@ /obj/effect/floor_decal/corner/green{ dir = 10 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -3 }, /turf/simulated/floor/tiled/light, @@ -18085,7 +18085,7 @@ /area/enviro_testing_facility/inside/crew/quarters) "stc" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/basalt, /area/template_noop) "stS" = ( @@ -18357,7 +18357,7 @@ /obj/item/clothing/glasses/safety/goggles/science{ pixel_y = 10 }, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_x = -4 }, /obj/machinery/light{ @@ -18461,7 +18461,7 @@ dir = 10 }, /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -3; pixel_y = 5 }, @@ -18824,7 +18824,7 @@ /area/enviro_testing_facility/inside/crew/quarters) "tgV" = ( /obj/structure/table/standard, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -3; pixel_y = 3 }, @@ -18966,7 +18966,7 @@ /area/enviro_testing_facility/inside/security/hallway) "tlW" = ( /obj/structure/table/standard, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -3; pixel_y = -3 }, @@ -19180,7 +19180,7 @@ /area/enviro_testing_facility/inside/maintenance/engineering_north) "tuV" = ( /obj/structure/table/standard, -/obj/item/device/integrated_electronics/wirer, +/obj/item/integrated_electronics/wirer, /turf/simulated/floor/tiled/white, /area/enviro_testing_facility/inside/research/rnd) "tvA" = ( @@ -19496,7 +19496,7 @@ /area/template_noop) "tLz" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 4; pixel_y = 8 }, @@ -19700,7 +19700,7 @@ /turf/simulated/floor/tiled/white, /area/enviro_testing_facility/inside/medical/recovery_2) "tVk" = ( -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_x = 3; pixel_y = -2 }, @@ -19880,7 +19880,7 @@ /area/enviro_testing_facility/inside/control/offices) "tZm" = ( /obj/structure/table/steel, -/obj/item/device/mmi/digital/robot{ +/obj/item/mmi/digital/robot{ pixel_x = -5 }, /turf/simulated/floor/carpet/rubber, @@ -20013,7 +20013,7 @@ /obj/effect/floor_decal/corner/pink{ dir = 1 }, -/obj/item/device/electronic_assembly/drone/android, +/obj/item/electronic_assembly/drone/android, /obj/machinery/alarm/north{ req_one_access = null }, @@ -20862,7 +20862,7 @@ /obj/structure/table/glass{ table_reinf = "glass" }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -3 }, /turf/simulated/floor/tiled/white, @@ -21463,7 +21463,7 @@ /area/enviro_testing_facility/inside/engineering/robo_lab) "vKU" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_x = -3; pixel_y = 6 }, @@ -21807,7 +21807,7 @@ "wct" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/pink/diagonal, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_x = -4; pixel_y = 4 }, @@ -22683,7 +22683,7 @@ pixel_x = -2; pixel_y = 17 }, -/obj/item/device/advanced_healthanalyzer, +/obj/item/advanced_healthanalyzer, /turf/simulated/floor/carpet/green, /area/enviro_testing_facility/inside/medical/chief_office) "wVB" = ( @@ -22867,7 +22867,7 @@ /obj/machinery/door/firedoor/noid, /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_x = 7; pixel_y = 6 }, @@ -22903,7 +22903,7 @@ /area/enviro_testing_facility/inside/engineering/reactors) "xlJ" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/light{ dir = 1 }, diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm b/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm index 4c37e777abd..f1a9a0922c0 100644 --- a/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm +++ b/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm @@ -111,7 +111,7 @@ /obj/effect/floor_decal/corner/purple{ dir = 6 }, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable/green{ icon_state = "0-2" @@ -238,7 +238,7 @@ /area/nuclear_silo/lower_level/security) "aA" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, @@ -387,7 +387,7 @@ /area/nuclear_silo/outside/cave/bunker) "aU" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/darkblue, /area/nuclear_silo/outside/buildings) "aV" = ( @@ -2541,8 +2541,8 @@ /obj/random/tool, /obj/random/tool, /obj/random/tool, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, @@ -3319,7 +3319,7 @@ /area/nuclear_silo/lower_level/hallway) "hs" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 16; pixel_x = -7 }, @@ -3361,7 +3361,7 @@ /area/nuclear_silo/lower_level/hallway) "hx" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -3519,7 +3519,7 @@ /area/nuclear_silo/lower_level/civilian/messhall) "hP" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /obj/effect/landmark/minimap_poi{ name = "Wooden Town" }, @@ -4495,7 +4495,7 @@ /obj/random/medical, /obj/random/medical, /obj/item/auto_cpr, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -4632,7 +4632,7 @@ /area/nuclear_silo/outside/buildings) "kp" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -5102,7 +5102,7 @@ "lk" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/clothing/accessory/storage/pouches/white, /obj/item/auto_cpr, /obj/item/clothing/accessory/stethoscope, @@ -5655,7 +5655,7 @@ pixel_x = -8; pixel_y = 16 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -6 }, /turf/simulated/floor/tiled/steel, @@ -5665,7 +5665,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 14; pixel_x = 5 }, @@ -5931,7 +5931,7 @@ /area/nuclear_silo/lower_level/civilian/messhall) "nc" = ( /obj/structure/table/standard, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 6 }, /obj/effect/floor_decal/corner/blue{ @@ -6663,7 +6663,7 @@ /area/nuclear_silo/outside/buildings) "oK" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet/purple, /area/nuclear_silo/outside/buildings) "oL" = ( @@ -7255,7 +7255,7 @@ /area/nuclear_silo/outside/buildings) "qf" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/effect/decal/cleanable/floor_damage/random_wood_broken, /obj/item/gun/projectile/improvised_handgun, /obj/item/ammo_magazine/c45m{ @@ -7271,7 +7271,7 @@ /obj/structure/closet/crate/miningcart, /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor/exoplanet/barren, /area/nuclear_silo/outside/mountain) "qh" = ( @@ -8012,7 +8012,7 @@ name = "adjusted railing" }, /obj/structure/table/steel, -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, @@ -10409,12 +10409,12 @@ dir = 9 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/white, /area/nuclear_silo/lower_level/medbay) "xb" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/full, /area/nuclear_silo/outside/buildings) "xc" = ( @@ -10733,7 +10733,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -10837,7 +10837,7 @@ /area/nuclear_silo/outside/buildings) "xX" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/turretid/lethal{ dir = 8; name = "Bunker Turrets Control"; @@ -10942,7 +10942,7 @@ name = "Armoury Bolts" }, /obj/structure/table/standard, -/obj/item/device/firing_pin{ +/obj/item/firing_pin{ pixel_y = -5 }, /obj/item/wrench{ @@ -12024,7 +12024,7 @@ pixel_x = 8; pixel_y = 8 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 9; pixel_y = -7 }, @@ -12082,7 +12082,7 @@ /area/nuclear_silo/outside/surface) "AM" = ( /obj/structure/flora/rock/pile/random, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -5; pixel_y = 3 }, @@ -12270,7 +12270,7 @@ /area/nuclear_silo/lower_level/maintenance/engimed) "Be" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/dirt_75, /turf/simulated/floor/tiled, @@ -12733,7 +12733,7 @@ /obj/structure/track, /obj/structure/closet/crate/miningcart, /obj/item/pickaxe, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/barren, /area/nuclear_silo/outside/mountain) "Cf" = ( @@ -12984,11 +12984,11 @@ pixel_x = -1; pixel_y = 1 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 13; pixel_x = -6 }, -/obj/item/device/pin_extractor{ +/obj/item/pin_extractor{ pixel_y = -7 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -13271,7 +13271,7 @@ /area/nuclear_silo/lower_level/nuke_silo) "Dl" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 15 }, /obj/item/material/ashtray/glass{ @@ -14128,7 +14128,7 @@ "Fi" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline_straight/security, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/full, @@ -14545,7 +14545,7 @@ /turf/simulated/floor/tiled/white, /area/nuclear_silo/lower_level/civilian/bathrooms) "Ge" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/barren, /area/nuclear_silo/outside/mountain) "Gf" = ( @@ -14913,7 +14913,7 @@ /obj/item/clothing/head/beret/security, /obj/item/clothing/suit/storage/hazardvest/security/officer, /obj/item/clothing/suit/storage/hooded/wintercoat/security, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/glasses/sunglasses/sechud/aviator, /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -15405,14 +15405,14 @@ /obj/item/stack/material/phoron{ amount = 6 }, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, @@ -16706,7 +16706,7 @@ /obj/item/clothing/head/beret/security, /obj/item/clothing/suit/storage/hazardvest/security/officer, /obj/item/clothing/suit/storage/hooded/wintercoat/security, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/glasses/sunglasses/sechud/aviator, /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -16715,7 +16715,7 @@ /turf/simulated/floor/tiled, /area/nuclear_silo/lower_level/security) "KR" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/random/dirt_75, /turf/simulated/floor/exoplanet/dirt_konyang, /area/nuclear_silo/outside/mountain) @@ -17595,7 +17595,7 @@ /obj/item/stack/cable_coil, /obj/item/wirecutters, /obj/item/weldingtool, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/random/powercell, /obj/random/powercell, /obj/structure/table/rack/folding_table, @@ -18634,7 +18634,7 @@ /area/nuclear_silo/lower_level/maintenance/engimed) "Pp" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/carpet/red, /area/nuclear_silo/outside/buildings) "Pq" = ( @@ -20140,7 +20140,7 @@ /area/nuclear_silo/lower_level/security) "SG" = ( /obj/structure/table/standard, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/effect/floor_decal/corner_wide/green{ dir = 10 }, @@ -20693,7 +20693,7 @@ /area/nuclear_silo/lower_level/maintenance/east) "TR" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/random/dirt_75, /turf/simulated/floor/carpet/lightblue, /area/nuclear_silo/outside/cave/bunker) @@ -20877,7 +20877,7 @@ /turf/simulated/floor/tiled/full, /area/nuclear_silo/outside/buildings) "Un" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/random/dirt_75, /turf/simulated/floor/exoplanet/barren, /area/nuclear_silo/outside/mountain) @@ -21499,11 +21499,11 @@ /area/nuclear_silo/lower_level/nuke_monitoring) "VK" = ( /obj/structure/table/rack/folding_table, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -5; pixel_y = 3 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 4; pixel_x = -10 }, @@ -22969,7 +22969,7 @@ /area/nuclear_silo/outside/buildings/town) "YH" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 10; pixel_x = -2 }, @@ -23489,8 +23489,8 @@ "ZQ" = ( /obj/random/dirt_75, /obj/structure/table/standard, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled, /area/nuclear_silo/lower_level/engineering) "ZR" = ( diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm b/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm index 7d7dae99685..36c7a2c414a 100644 --- a/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm +++ b/maps/away/scenarios/nuclear_silo/nuclear_silo_outfits.dm @@ -3,9 +3,9 @@ /obj/outfit/admin/generic/nuclear_silo_crew name = "Arctic Valley Citizen Uniform" - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship id = /obj/item/card/id/syndicate - l_pocket = /obj/item/device/radio/hailing + l_pocket = /obj/item/radio/hailing /obj/outfit/admin/generic/nuclear_silo_crew/get_id_access() return list( @@ -98,7 +98,7 @@ accessory = /obj/item/clothing/accessory/holster/hip/brown accessory_contents = list(/obj/item/gun/projectile/leyon) - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/storage/wallet/random = 1, @@ -214,8 +214,8 @@ backpack_contents = list( /obj/item/tape_roll = 1, /obj/item/taperoll/engineering = 1, - /obj/item/device/magnetic_lock/engineering = 1, - /obj/item/device/gps/engineering = 1, + /obj/item/magnetic_lock/engineering = 1, + /obj/item/gps/engineering = 1, ) species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless, @@ -270,7 +270,7 @@ mask = null glasses = null r_pocket = /obj/item/reagent_containers/hypospray - l_pocket = /obj/item/device/healthanalyzer + l_pocket = /obj/item/healthanalyzer species_gloves = list( SPECIES_UNATHI = /obj/item/clothing/gloves/latex/nitrile/unathi, SPECIES_TAJARA = /obj/item/clothing/gloves/latex/nitrile/tajara, @@ -363,7 +363,7 @@ /obj/item/clothing/glasses/sunglasses/sechud/aviator, ) l_pocket = /obj/item/handcuffs/ziptie - r_pocket = /obj/item/device/gps + r_pocket = /obj/item/gps accessory = list ( /obj/item/clothing/accessory/holster/armpit, /obj/item/clothing/accessory/holster/armpit/brown, @@ -412,7 +412,7 @@ accessory_contents = list(/obj/item/gun/projectile/revolver) id = /obj/item/card/id/syndicate - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/storage/wallet/random = 1, @@ -452,7 +452,7 @@ /obj/item/storage/backpack/satchel/pocketbook, ) id = /obj/item/card/id/syndicate - l_ear = /obj/item/device/radio/headset/distress + l_ear = /obj/item/radio/headset/distress backpack_contents = list( /obj/item/storage/box/fancy/cigarettes/dromedaryco = 1, /obj/item/flame/lighter/zippo = 1, diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm b/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm index c146051ac5e..d484e367829 100644 --- a/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm +++ b/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm @@ -917,7 +917,7 @@ /area/template_noop) "rf" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/random/dirt_75, @@ -1203,7 +1203,7 @@ /area/template_noop) "vE" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -1319,7 +1319,7 @@ /area/template_noop) "xl" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/item/gamehelm/brown, @@ -1684,7 +1684,7 @@ /area/template_noop) "DZ" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /turf/simulated/floor/tiled, @@ -1996,7 +1996,7 @@ /area/template_noop) "Id" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/machinery/light{ @@ -2048,7 +2048,7 @@ /area/template_noop) "Jm" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /turf/simulated/floor/wood/mahogany, @@ -2177,7 +2177,7 @@ /area/template_noop) "Mk" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/machinery/light{ @@ -2649,7 +2649,7 @@ /area/template_noop) "Vc" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/random/dirt_75, diff --git a/maps/away/scenarios/ruined_propellant_depot/ruined_propellant_depot.dmm b/maps/away/scenarios/ruined_propellant_depot/ruined_propellant_depot.dmm index 6b87881e138..85107df1d9d 100644 --- a/maps/away/scenarios/ruined_propellant_depot/ruined_propellant_depot.dmm +++ b/maps/away/scenarios/ruined_propellant_depot/ruined_propellant_depot.dmm @@ -454,7 +454,7 @@ /area/ruined_propellant_depot/docks_north_east) "bo" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4; pixel_x = -5 }, @@ -567,7 +567,7 @@ /area/ruined_propellant_depot/atmos_propellant) "bH" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/flare/glowstick/random{ +/obj/item/flashlight/flare/glowstick/random{ pixel_y = -10; pixel_x = -2 }, @@ -1414,7 +1414,7 @@ /obj/random/tool, /obj/random/tool, /obj/random/tool, -/obj/item/device/flashlight/flare/glowstick/random, +/obj/item/flashlight/flare/glowstick/random, /obj/random/dirt_75, /obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, @@ -1826,7 +1826,7 @@ /turf/simulated/floor/plating, /area/ruined_propellant_depot/docks_north_east) "fs" = ( -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7; pixel_x = 11 }, @@ -2195,7 +2195,7 @@ /obj/item/storage/box/lights/mixed, /obj/item/reagent_containers/glass/bucket, /obj/item/clothing/gloves/janitor, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/random/dirt_75, /obj/random/dirt_75, /turf/simulated/floor/tiled, @@ -2257,7 +2257,7 @@ pixel_x = 3; pixel_y = 5 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -3; pixel_y = 7 }, @@ -3805,7 +3805,7 @@ /obj/structure/table/glass{ table_reinf = "glass" }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -3; pixel_y = 4 }, @@ -4143,7 +4143,7 @@ /area/ruined_propellant_depot/atmos_air) "nn" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -5; pixel_y = 3; on = 0 @@ -4548,7 +4548,7 @@ /area/ruined_propellant_depot/crew_quarters) "oE" = ( /obj/structure/table/steel, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7 }, /obj/random/dirt_75, @@ -4619,7 +4619,7 @@ /obj/structure/closet, /obj/random/tool, /obj/random/tool, -/obj/item/device/flashlight/flare/glowstick/random, +/obj/item/flashlight/flare/glowstick/random, /obj/random/tool, /obj/random/dirt_75, /obj/random/dirt_75, @@ -4743,7 +4743,7 @@ /area/ruined_propellant_depot/eva) "pl" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 4 }, @@ -4995,7 +4995,7 @@ pixel_x = -4; pixel_y = -8 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 4 }, @@ -5171,7 +5171,7 @@ /area/ruined_propellant_depot/maint) "qJ" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -2; pixel_y = 4 }, @@ -5458,7 +5458,7 @@ /turf/simulated/floor/tiled, /area/ruined_propellant_depot/atmos_air) "rN" = ( -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7; pixel_x = 11 }, @@ -6781,8 +6781,8 @@ /area/ruined_propellant_depot/engineering) "vQ" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight, -/obj/item/device/flashlight/flare/glowstick, +/obj/item/flashlight, +/obj/item/flashlight/flare/glowstick, /obj/random/dirt_75, /obj/machinery/light/colored/dying{ dir = 8 @@ -7864,7 +7864,7 @@ /obj/structure/closet/crate, /obj/random/tool, /obj/random/tool, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tool, @@ -8001,7 +8001,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/structure/lattice/catwalk/indoor/grate, @@ -8186,7 +8186,7 @@ /area/ruined_propellant_depot/hallways_west) "Ai" = ( /obj/structure/table/steel, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ frequency = 1280; pixel_y = 11 }, @@ -8495,7 +8495,7 @@ /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/wood, /obj/random/dirt_75, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = 2; pixel_y = 5 }, @@ -8575,7 +8575,7 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern/on{ +/obj/item/flashlight/lantern/on{ pixel_y = -3; pixel_x = -7 }, @@ -9146,7 +9146,7 @@ /area/ruined_propellant_depot/hallways_south) "Di" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 4 }, /obj/machinery/alarm/east{ @@ -10367,7 +10367,7 @@ dir = 4 }, /obj/random/dirt_75, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -13; pixel_y = 3 }, @@ -11133,7 +11133,7 @@ /turf/simulated/floor/plating, /area/ruined_propellant_depot/docks_south_west) "Jq" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/machinery/portable_atmospherics/powered/pump, @@ -11178,7 +11178,7 @@ /turf/simulated/floor/tiled, /area/ruined_propellant_depot/engineering) "Jw" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /turf/simulated/floor/tiled/full, @@ -11717,11 +11717,11 @@ /area/ruined_propellant_depot/docks_north_east) "Lg" = ( /obj/structure/closet, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -8 }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight{ pixel_y = 8 }, /obj/random/dirt_75, @@ -12658,14 +12658,14 @@ /obj/item/clothing/gloves/latex, /obj/item/clothing/head/nursehat, /obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/device/healthanalyzer, -/obj/item/device/breath_analyzer, +/obj/item/healthanalyzer, +/obj/item/breath_analyzer, /obj/random/dirt_75, /turf/simulated/floor/tiled/white, /area/ruined_propellant_depot/medbay) "Oh" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_x = -8; pixel_y = 1 }, @@ -13791,7 +13791,7 @@ /turf/simulated/floor/tiled/white, /area/ruined_propellant_depot/kitchen) "RH" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/random/dirt_75, @@ -13995,7 +13995,7 @@ /turf/simulated/floor/plating, /area/ruined_propellant_depot/atmos_air_aux_fill) "SE" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/random/dirt_75, @@ -14329,7 +14329,7 @@ /turf/simulated/floor/tiled, /area/ruined_propellant_depot/security) "Tz" = ( -/obj/item/device/flashlight/survival{ +/obj/item/flashlight/survival{ pixel_x = 10; pixel_y = 6 }, @@ -14924,7 +14924,7 @@ /area/ruined_propellant_depot/hallways_west) "Vo" = ( /obj/structure/lattice/catwalk, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 7; pixel_x = -4 }, @@ -16180,7 +16180,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /obj/effect/floor_decal/industrial/warning, diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 909903209fb..8e3c8dd133e 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -74,7 +74,7 @@ /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/corner_wide/brown/full, /obj/item/storage/toolbox/mechanical, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 13 }, /obj/effect/decal/cleanable/dirt, @@ -931,7 +931,7 @@ dir = 10 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 10; pixel_x = 5 }, @@ -2318,7 +2318,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_y = 7; pixel_x = 4 }, @@ -2530,7 +2530,7 @@ pixel_x = -8 }, /obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp/lava/purple{ +/obj/item/flashlight/lamp/lava/purple{ pixel_x = 7; pixel_y = 9 }, @@ -2660,7 +2660,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 6; pixel_x = -3 }, @@ -3166,7 +3166,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ on = 0; pixel_y = -5; pixel_x = -6 @@ -3269,7 +3269,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_x = -24; pixel_y = 32; gps_prefix = "TCAF"; @@ -4182,10 +4182,10 @@ pixel_x = 34; pixel_y = -8 }, -/obj/item/device/binoculars/high_power, -/obj/item/device/binoculars, -/obj/item/device/radio/hailing, -/obj/item/device/radio, +/obj/item/binoculars/high_power, +/obj/item/binoculars, +/obj/item/radio/hailing, +/obj/item/radio, /obj/item/storage/toolbox/mechanical{ pixel_y = -2 }, @@ -4474,7 +4474,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 4 }, /turf/simulated/floor/carpet/rubber, @@ -4847,9 +4847,9 @@ "rJ" = ( /obj/structure/closet/cabinet, /obj/effect/floor_decal/industrial/outline/service, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/item/material/twohanded/pike/flag, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/item/spacecash/c1000, /obj/item/spacecash/c1000, /obj/item/spacecash/c1000, @@ -4860,7 +4860,7 @@ }, /obj/item/storage/briefcase, /obj/item/storage/secure/briefcase, -/obj/item/device/camera, +/obj/item/camera, /obj/item/clothing/accessory/badge/tcaf_papers/service, /obj/item/reagent_containers/food/drinks/flask, /turf/simulated/floor/tiled/dark/full, @@ -5093,11 +5093,11 @@ pixel_x = 2; pixel_y = 11 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 6; pixel_x = -5 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 6; pixel_x = 6 }, @@ -5343,7 +5343,7 @@ /area/tcaf_corvette/cargo_bay) "tZ" = ( /obj/structure/table/glass, -/obj/item/device/versebook/biesel{ +/obj/item/versebook/biesel{ pixel_y = 5; pixel_x = -16 }, @@ -5480,7 +5480,7 @@ }, /obj/structure/closet/crate/drop, /obj/effect/decal/cleanable/dirt, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil/orange, /obj/item/stack/cable_coil/orange, /obj/item/clothing/head/welding, @@ -5558,11 +5558,11 @@ must_start_working = 1 }, /obj/structure/table/reinforced/steel, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_y = 6; pixel_x = -4 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_y = 6; pixel_x = 7 }, @@ -5862,7 +5862,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 13 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 1; pixel_x = 7 }, @@ -6535,7 +6535,7 @@ pixel_x = 34; pixel_y = -6 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /obj/effect/floor_decal/industrial/outline/security, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/gunmetal, @@ -7046,7 +7046,7 @@ pixel_x = -8; pixel_y = 2 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = -1; pixel_x = 4 }, @@ -7083,7 +7083,7 @@ dir = 4 }, /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = -1; pixel_x = -7 }, @@ -7117,12 +7117,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/box/handcuffs, /obj/item/storage/box/tactical/flashbangs, /obj/item/storage/box/tactical/smokebombs, @@ -7567,7 +7567,7 @@ }, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/device/synthesized_instrument/guitar{ +/obj/item/synthesized_instrument/guitar{ pixel_y = 22; pixel_x = 2 }, @@ -8060,18 +8060,18 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/item/stack/material/phoron{ amount = 6 }, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/item/material/stool/chair/wheelchair, /obj/item/material/stool/chair/wheelchair, /obj/item/cane/crutch, @@ -8622,7 +8622,7 @@ /obj/item/clothing/accessory/crucifix/gold, /obj/item/clothing/head/hijab/black, /obj/item/clothing/ears/skrell/scrunchy, -/obj/item/device/flashlight/headlights, +/obj/item/flashlight/headlights, /obj/item/clothing/mask/trinary_mask, /obj/item/clothing/accessory/badge/trinary, /obj/item/clothing/head/kippah, @@ -8670,12 +8670,12 @@ icon_state = "bible"; desc = "This is a copy of the Bible, the holy text of Christianity, embossed at the front with a fancy golden image of a crucifix. On closer inspection, this one contains seventy-three books inside it, indicating that it is a Catholic variation of the book. There are several notes dispersed throughout clarifying the original words in Latin Vulgate where they may not translate perfectly to Tau Ceti Basic." }, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/siakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/trinary, +/obj/item/versebook/tribunal, +/obj/item/versebook/autakh, +/obj/item/versebook/siakh, +/obj/item/versebook/skakh, +/obj/item/versebook/thakh, +/obj/item/versebook/trinary, /obj/item/clothing/accessory/tajaran/charm, /obj/item/flag/trinaryperfection, /obj/item/flag/traverse, @@ -8991,27 +8991,27 @@ /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "TCAF"; gpstag = "TCAF0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "TCAF"; gpstag = "TCAF0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "TCAF"; gpstag = "TCAF0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "TCAF"; gpstag = "TCAF0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "TCAF"; gpstag = "TCAF0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "TCAF"; gpstag = "TCAF0" }, @@ -9699,10 +9699,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, /obj/item/deployable_kit/legion_barrier, /obj/item/deployable_kit/legion_barrier, /obj/item/deployable_kit/legion_barrier, @@ -11165,7 +11165,7 @@ pixel_y = 9; pixel_x = 6 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/ridged, /area/tcaf_corvette/cic) @@ -11452,7 +11452,7 @@ "SR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/steel, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -8; pixel_y = 14 }, @@ -11462,7 +11462,7 @@ /obj/item/tank/hydrogen/shuttle{ pixel_x = 3 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 6; pixel_y = 16 }, @@ -12081,7 +12081,7 @@ "Vi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/rack/folding_table, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = 6; pixel_x = 2 }, @@ -12677,12 +12677,12 @@ /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/rubber, /area/tcaf_corvette/storage) diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm index 0c935a7db55..1f926ed6f86 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm @@ -26,7 +26,7 @@ head = /obj/item/clothing/head/tcaf_technician id = /obj/item/card/id/tcaf accessory = /obj/item/clothing/accessory/holster/hip - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1) species_shoes = list( diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm index 4b4534155cb..629c1fe1e43 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm @@ -488,8 +488,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/tcfl_peacekeeper_ship) "ehg" = ( @@ -587,7 +587,7 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/shuttle/black, /area/shuttle/tcfl_shuttle) "ett" = ( @@ -785,8 +785,8 @@ /obj/structure/table/rack, /obj/item/deployable_kit/legion_barrier, /obj/item/deployable_kit/legion_barrier, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/extinguisher_cabinet/west, /obj/machinery/light{ @@ -894,10 +894,10 @@ "fQq" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/ship/tcfl_peacekeeper_ship) "fQL" = ( @@ -1477,7 +1477,7 @@ "iQk" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/shuttle/black, /area/shuttle/tcfl_shuttle) "iSW" = ( @@ -1745,7 +1745,7 @@ "kiO" = ( /obj/structure/table/wood, /obj/item/clothing/suit/storage/legion, -/obj/item/device/versebook/biesel{ +/obj/item/versebook/biesel{ pixel_y = -6 }, /turf/simulated/floor/wood, @@ -1909,7 +1909,7 @@ /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/mechanical, /obj/item/storage/bag/inflatable, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/item/storage/belt/utility, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, @@ -2204,8 +2204,8 @@ /area/ship/tcfl_peacekeeper_ship) "mPM" = ( /obj/structure/table/steel, -/obj/item/device/versebook/biesel, -/obj/item/device/flashlight/maglight, +/obj/item/versebook/biesel, +/obj/item/flashlight/maglight, /obj/machinery/light{ dir = 1; icon_state = "tube_empty" @@ -2329,7 +2329,7 @@ /area/ship/tcfl_peacekeeper_ship) "nFw" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/shuttle/tan, /area/ship/tcfl_peacekeeper_ship) "nJs" = ( @@ -2383,7 +2383,7 @@ /area/ship/tcfl_peacekeeper_ship) "opS" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/blue, +/obj/item/flashlight/lamp/lava/blue, /obj/structure/sign/flag/biesel{ pixel_x = -32; pixel_y = 32 @@ -2588,7 +2588,7 @@ /area/ship/tcfl_peacekeeper_ship) "pCa" = ( /obj/structure/table/standard, -/obj/item/device/megaphone/red{ +/obj/item/megaphone/red{ pixel_y = -4 }, /obj/item/paper_bin{ @@ -2606,7 +2606,7 @@ /area/ship/tcfl_peacekeeper_ship) "pIz" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 }, @@ -2657,7 +2657,7 @@ /obj/item/gun/energy/stunrevolver, /obj/item/gun/energy/taser, /obj/item/storage/box/zipties, -/obj/item/device/flash, +/obj/item/flash, /obj/item/reagent_containers/spray/pepper, /obj/machinery/light/small{ dir = 1 @@ -2674,7 +2674,7 @@ /obj/item/gun/energy/stunrevolver, /obj/item/gun/energy/taser, /obj/item/storage/box/zipties, -/obj/item/device/flash, +/obj/item/flash, /obj/item/reagent_containers/spray/pepper, /obj/item/storage/box/tactical/smokebombs, /obj/item/storage/belt/security, @@ -3248,8 +3248,8 @@ dir = 10 }, /obj/structure/table/standard, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, /turf/simulated/floor/tiled/dark, /area/ship/tcfl_peacekeeper_ship) "tqn" = ( @@ -3408,7 +3408,7 @@ dir = 5 }, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/ship/tcfl_peacekeeper_ship) "urq" = ( @@ -3779,8 +3779,8 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/tcfl_peacekeeper_ship) "yiy" = ( diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm index ddf188b86e8..8e745911959 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm @@ -30,7 +30,7 @@ id = /obj/item/card/id/tcfl_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife = 1, /obj/item/clothing/accessory/storage/pouches/brown = 1) species_shoes = list( diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm index 525e28ce606..9722441ddd4 100644 --- a/maps/away/ships/casino/casino.dmm +++ b/maps/away/ships/casino/casino.dmm @@ -166,14 +166,14 @@ pixel_x = -30; pixel_y = -8 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/casino/casino_maintenance) "aI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ id_tag = "casino_solar_pump" }, @@ -185,7 +185,7 @@ /turf/simulated/floor/tiled, /area/casino/casino_bridge) "aL" = ( -/obj/item/device/radio, +/obj/item/radio, /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/casino/casino_bridge) @@ -721,7 +721,7 @@ /turf/simulated/floor/plating, /area/casino/casino_security) "cj" = ( -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/plating, /area/casino/casino_security) "ck" = ( @@ -865,7 +865,7 @@ /turf/simulated/floor/tiled, /area/casino/casino_security) "cB" = ( -/obj/item/device/radio, +/obj/item/radio, /obj/structure/table/steel, /obj/item/reagent_containers/spray/pepper{ pixel_x = -6; @@ -1456,7 +1456,7 @@ /turf/simulated/floor/plating, /area/casino/casino_storage) "eA" = ( -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/wirecutters, /turf/simulated/floor/tiled, /area/casino/casino_security) @@ -1907,7 +1907,7 @@ /turf/simulated/floor/tiled, /area/casino/casino_security) "fH" = ( -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -2495,7 +2495,7 @@ /turf/simulated/floor/carpet/brown, /area/casino/casino_mainfloor) "hz" = ( -/obj/item/device/flash, +/obj/item/flash, /turf/simulated/floor/carpet/brown, /area/casino/casino_mainfloor) "hA" = ( @@ -3409,7 +3409,7 @@ /area/casino/casino_crew_atmos) "jQ" = ( /obj/structure/table/standard, -/obj/item/device/radio, +/obj/item/radio, /obj/item/storage/box/fancy/candle_box, /obj/item/storage/box/fancy/cigarettes/dpra, /obj/item/storage/box/fancy/cigarettes/dpra, @@ -3685,7 +3685,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/plating, /area/casino/casino_crew_atmos) "kG" = ( @@ -4572,7 +4572,7 @@ /turf/simulated/floor, /area/casino/casino_bow) "nj" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light/small{ dir = 4 }, @@ -4696,7 +4696,7 @@ /obj/machinery/vending/wallmed1{ pixel_x = -25 }, -/obj/item/device/radio, +/obj/item/radio, /obj/effect/decal/cleanable/blood/splatter, /obj/structure/cable{ d1 = 1; diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index 93a50e5ad14..fc5e7d8a7d0 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -445,7 +445,7 @@ /obj/structure/railing/mapped, /obj/structure/table/rack, /obj/item/hoist_kit, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/gunnery) "bxl" = ( @@ -644,8 +644,8 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark/full, @@ -1146,12 +1146,12 @@ "eFo" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, @@ -1163,7 +1163,7 @@ /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/voidsuits) "eFH" = ( @@ -1800,7 +1800,7 @@ /area/ship/ranger_corvette/crew) "gUN" = ( /obj/structure/table/wood, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_x = 6; @@ -2545,7 +2545,7 @@ desc = "A rectangular steel footlocker."; name = "footlocker" }, -/obj/item/device/paicard, +/obj/item/paicard, /obj/item/clothing/suit/storage/hooded/wintercoat/konyang, /obj/item/clothing/accessory/flagpatch/konyang, /obj/item/toy/comic/inspector, @@ -3282,7 +3282,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/gunnery) "ndT" = ( -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -4700,7 +4700,7 @@ "stJ" = ( /obj/structure/table/steel, /obj/item/shovel/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -5048,12 +5048,12 @@ /obj/item/flag/fisanduh, /obj/item/clothing/head/ushanka/dominia, /obj/item/clothing/suit/storage/toggle/dominia/bomber, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/pouches/brown, diff --git a/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm b/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm index 00748944ca6..af83a92772e 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm +++ b/maps/away/ships/coc/coc_ranger/coc_ship_ghostroles.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/ranger_ship - l_ear = /obj/item/device/radio/headset/ship/coalition_navy + l_ear = /obj/item/radio/headset/ship/coalition_navy backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm index 4840c58e2a3..16b17070271 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm @@ -1256,8 +1256,8 @@ /obj/item/reagent_containers/food/drinks/cans/beetle_milk, /obj/item/reagent_containers/glass/bucket, /obj/effect/floor_decal/industrial/outline/service, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/item/reagent_containers/food/drinks/waterbottle, /obj/item/reagent_containers/food/drinks/waterbottle, /turf/simulated/floor/tiled/dark/full, @@ -1682,7 +1682,7 @@ /obj/item/storage/bag/trash, /obj/item/clothing/gloves/janitor, /obj/item/reagent_containers/glass/rag/advanced, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/item/reagent_containers/spray/cleaner, /obj/structure/closet/crate, /turf/simulated/floor/tiled/dark, @@ -2814,7 +2814,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/ears/earmuffs{ pixel_y = 2 }, @@ -3177,12 +3177,12 @@ }, /obj/machinery/cell_charger, /obj/random/powercell, -/obj/item/device/radio/off, -/obj/item/device/analyzer, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/analyzer, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/item/plastique/seismic{ pixel_y = 15; pixel_x = -5 @@ -3275,18 +3275,18 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/ship/coc_scarab/equipment) "nN" = ( @@ -4911,7 +4911,7 @@ /obj/machinery/cell_charger{ pixel_x = -3 }, -/obj/item/device/radio/intercom/expedition/hailing/west, +/obj/item/radio/intercom/expedition/hailing/west, /turf/simulated/floor/carpet/rubber, /area/ship/coc_scarab/bridge) "ur" = ( @@ -8244,7 +8244,7 @@ pixel_x = -7; pixel_y = -1 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 10; pixel_x = 8 }, @@ -8675,7 +8675,7 @@ pixel_y = 10; pixel_x = -6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 10; pixel_x = -8 }, @@ -8694,7 +8694,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/device/radio/intercom/expedition/hailing/east, +/obj/item/radio/intercom/expedition/hailing/east, /turf/simulated/floor/carpet/rubber, /area/ship/coc_scarab/bridge) "IK" = ( @@ -8810,7 +8810,7 @@ req_access = null }, /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ brightness_level = "low"; pixel_y = 10; pixel_x = -2 @@ -9821,10 +9821,10 @@ /obj/item/storage/bag/ore, /obj/item/storage/bag/ore, /obj/item/storage/bag/ore, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/power/apc/high/north{ req_access = null }, @@ -11192,7 +11192,7 @@ pixel_y = 30; pixel_x = -45 }, -/obj/item/device/radio/intercom/expedition/hailing/north{ +/obj/item/radio/intercom/expedition/hailing/north{ pixel_x = -27; pixel_y = 19 }, diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm b/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm index 08897e1fcc8..2439378160d 100644 --- a/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm +++ b/maps/away/ships/coc/coc_scarab/coc_scarab_ghostroles.dm @@ -28,7 +28,7 @@ back = /obj/item/storage/backpack/industrial l_pocket = /obj/item/clothing/accessory/badge/passcard/scarab/gold r_pocket = /obj/item/wrench - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship belt = /obj/item/storage/belt/utility/full backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/pill_bottle/rmt = 1, /obj/item/clothing/accessory/offworlder/drab = 1, /obj/item/clothing/accessory/offworlder/bracer/drab = 1, /obj/item/clothing/accessory/offworlder/bracer/neckbrace/drab = 1, ) diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm index 106dda0e5a7..ea83ab4ce63 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm @@ -1098,7 +1098,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = -6 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/clothing/gloves/yellow, /turf/simulated/floor/tiled, /area/coc_survey_ship/atmos) @@ -1884,9 +1884,9 @@ /obj/item/clothing/head/helmet/space/void/mining/himeo, /obj/item/pickaxe/diamonddrill, /obj/item/gun/energy/blaster/carbine, -/obj/item/device/gps, +/obj/item/gps, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/coc_survey_ship/miningeva) "qp" = ( @@ -3389,12 +3389,12 @@ /obj/item/gun/projectile/shotgun/doublebarrel, /obj/item/storage/box/shells/buckshot, /obj/item/storage/box/shells/buckshot, -/obj/item/device/gps, +/obj/item/gps, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ dir = 1 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/coc_survey_ship/miningeva) "Cm" = ( @@ -4010,9 +4010,9 @@ /obj/item/gun/projectile/shotgun/doublebarrel, /obj/item/storage/box/shells/buckshot, /obj/item/storage/box/shells/buckshot, -/obj/item/device/gps, +/obj/item/gps, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/coc_survey_ship/miningeva) "GS" = ( @@ -4847,7 +4847,7 @@ /obj/item/rig_module/cooling_unit, /obj/item/rig_module/actuators, /obj/item/rig_module/maneuvering_jets, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/carpet/lightblue, /area/coc_survey_ship/captain) "Nq" = ( @@ -5536,7 +5536,7 @@ /area/coc_survey_ship/cargo) "TF" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/coc_survey_ship/miningeva) "TI" = ( @@ -5669,7 +5669,7 @@ /area/coc_survey_ship/anomaly) "UH" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/blueprints/outpost, /turf/simulated/floor/tiled, /area/coc_survey_ship/miningeva) @@ -5923,12 +5923,12 @@ /obj/item/clothing/head/helmet/space/void/mining/himeo, /obj/item/pickaxe/diamonddrill, /obj/item/gun/energy/blaster/carbine, -/obj/item/device/gps, +/obj/item/gps, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ dir = 1 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled, /area/coc_survey_ship/miningeva) "WO" = ( diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm b/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm index 718cfed379e..1a18e806b9d 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor_ghostroles.dm @@ -26,7 +26,7 @@ id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm index 9358f38204c..76d6245b46e 100644 --- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm +++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm @@ -663,7 +663,7 @@ /obj/item/clothing/suit/storage/gadpathur, /obj/item/clothing/suit/storage/toggle/trench/gadpathur, /obj/item/clothing/accessory/dogtags/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/item/clothing/glasses/regular, /obj/machinery/alarm/east{ req_one_access = list(223,224) @@ -1011,7 +1011,7 @@ /obj/item/clothing/suit/storage/gadpathur, /obj/item/clothing/suit/storage/toggle/trench/gadpathur, /obj/item/clothing/accessory/dogtags/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/item/clothing/glasses/regular, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -1515,7 +1515,7 @@ /obj/item/clothing/suit/storage/toggle/trench/gadpathur, /obj/item/clothing/suit/storage/toggle/trench/gadpathur/leather, /obj/item/clothing/accessory/dogtags/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/item/clothing/glasses/regular, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/clothing/accessory/holster/hip, @@ -3397,8 +3397,8 @@ /obj/item/storage/belt/security, /obj/item/melee/classic_baton, /obj/item/melee/classic_baton, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light, /obj/item/clothing/accessory/holster/waist, @@ -3684,7 +3684,7 @@ /obj/item/clothing/suit/storage/toggle/trench/gadpathur, /obj/item/clothing/suit/storage/toggle/trench/gadpathur/leather, /obj/item/clothing/accessory/dogtags/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -3876,7 +3876,7 @@ /obj/item/clothing/suit/storage/gadpathur, /obj/item/clothing/suit/storage/toggle/trench/gadpathur, /obj/item/clothing/accessory/dogtags/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/item/clothing/glasses/regular, /turf/simulated/floor/tiled, /area/ship/gadpathur_patrol/quarters) @@ -6220,7 +6220,7 @@ /obj/item/clothing/suit/storage/gadpathur, /obj/item/clothing/suit/storage/toggle/trench/gadpathur, /obj/item/clothing/accessory/dogtags/gadpathur, -/obj/item/device/versebook/gadpathur, +/obj/item/versebook/gadpathur, /obj/machinery/light{ dir = 4 }, @@ -6235,11 +6235,11 @@ /area/ship/gadpathur_patrol/quarters) "WU" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -6; pixel_y = 11 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 8 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm index 2be45f0d494..973555a6df9 100644 --- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm +++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol_ghostroles.dm @@ -31,7 +31,7 @@ id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship/coalition_navy + l_ear = /obj/item/radio/headset/ship/coalition_navy backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm index b8d86aad12d..412f498e52d 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm @@ -732,7 +732,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/versebook/tribunal{ +/obj/item/versebook/tribunal{ pixel_y = 3; pixel_x = -4 }, @@ -1915,7 +1915,7 @@ "dtB" = ( /obj/structure/lattice/catwalk/indoor, /obj/structure/table/rack/folding_table, -/obj/item/device/versebook/tribunal{ +/obj/item/versebook/tribunal{ pixel_y = 2 }, /turf/simulated/floor, @@ -2850,7 +2850,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/device/versebook/tribunal{ +/obj/item/versebook/tribunal{ pixel_y = 3; pixel_x = -4 }, @@ -3132,7 +3132,7 @@ /obj/effect/floor_decal/industrial/outline_segment/grey{ dir = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5; pixel_x = -1 }, @@ -4668,7 +4668,7 @@ dir = 8 }, /obj/structure/table/reinforced/steel, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/item/paper_bin{ pixel_y = 3; pixel_x = 4 @@ -5459,7 +5459,7 @@ /obj/item/storage/belt/medical, /obj/item/reagent_containers/hypospray, /obj/item/clothing/accessory/stethoscope, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/item/cane/crutch, /obj/item/cane/crutch, /obj/effect/floor_decal/corner/green{ @@ -5514,7 +5514,7 @@ /obj/effect/floor_decal/industrial/outline_segment/grey{ dir = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5; pixel_x = -1 }, @@ -7330,7 +7330,7 @@ "nIE" = ( /obj/structure/bed/stool/chair/sofa/right/black, /obj/effect/decal/cleanable/dirt, -/obj/item/device/synthesized_instrument/guitar{ +/obj/item/synthesized_instrument/guitar{ pixel_y = 2; pixel_x = 3 }, @@ -7352,11 +7352,11 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 7; pixel_y = 6 }, @@ -7678,11 +7678,11 @@ req_access = list(212) }, /obj/item/storage/box/dominia_honor, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/item/sticker/religious/tribunal, /obj/item/sticker/religious/tribunal, /obj/item/sticker/religious/tribunal, @@ -8120,7 +8120,7 @@ dir = 4 }, /obj/structure/table/reinforced/steel, -/obj/item/device/radio/intercom/hailing/west, +/obj/item/radio/intercom/hailing/west, /obj/machinery/recharger{ pixel_x = -5; pixel_y = 3 @@ -8129,11 +8129,11 @@ pixel_x = 5; pixel_y = 3 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 7; pixel_y = 6 }, @@ -8683,7 +8683,7 @@ pixel_y = 6; pixel_x = -6 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 3; pixel_x = 7 }, @@ -9404,8 +9404,8 @@ pixel_y = -2 }, /obj/item/storage/toolbox/emergency, -/obj/item/device/binoculars, -/obj/item/device/binoculars/high_power, +/obj/item/binoculars, +/obj/item/binoculars/high_power, /obj/structure/sign/flag/dominia{ pixel_x = 32; stand_icon = "banner" @@ -9636,12 +9636,12 @@ /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, @@ -10180,7 +10180,7 @@ pixel_y = 2; pixel_x = 5 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 14; pixel_x = -7 }, @@ -10939,11 +10939,11 @@ pixel_x = 3; pixel_y = 8 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 1; pixel_x = -5 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 3; pixel_x = 6 }, @@ -11896,12 +11896,12 @@ name = "Chapel Closet"; req_access = list(212) }, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/item/reagent_containers/food/drinks/bottle/dominian_wine, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12271,7 +12271,7 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 5 }, /turf/simulated/floor/tiled/gunmetal/full, diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette_ghostroles.dm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette_ghostroles.dm index a5aafc0f652..dc4e6694b45 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette_ghostroles.dm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette_ghostroles.dm @@ -31,7 +31,7 @@ id = /obj/item/card/id/imperial_fleet - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/clothing/accessory/badge/passport/dominia = 1) diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm index eafa6f71b6a..64bca8442a4 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm @@ -579,7 +579,7 @@ /area/ship/dominian_science_vessel/mess) "bpG" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/reinforced, /area/ship/dominian_science_vessel/isolation) "bqZ" = ( @@ -1000,28 +1000,28 @@ "cQs" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 6; gpstag = "SCC12" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 8; gpstag = "SCC11" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = -6; gpstag = "SCC13" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = -8; gpstag = "SCC14" }, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) "cTq" = ( @@ -1961,7 +1961,7 @@ /area/ship/dominian_science_vessel/aft_dock) "fnE" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/carpet/rubber, /area/ship/dominian_science_vessel/bridge) "fnY" = ( @@ -2464,7 +2464,7 @@ /obj/structure/table/steel, /obj/item/storage/box/beakers, /obj/item/storage/box/samplebags, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -2548,8 +2548,8 @@ /area/shuttle/dominian_science_shuttle) "huX" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars/high_power, +/obj/item/binoculars, +/obj/item/binoculars/high_power, /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, @@ -3081,7 +3081,7 @@ /area/shuttle/dominian_science_shuttle) "iRm" = ( /obj/structure/table/steel, -/obj/item/device/camera, +/obj/item/camera, /obj/item/paper_bin{ pixel_x = 4; pixel_y = 2 @@ -3166,7 +3166,7 @@ /area/shuttle/dominian_science_shuttle) "iXb" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/head/helmet/pilot{ pixel_x = 1 }, @@ -3667,17 +3667,17 @@ "kyi" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/flashlight, -/obj/item/device/radio, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/marshallingwand, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/radio, +/obj/item/flashlight/heavy, +/obj/item/flashlight/marshallingwand, +/obj/item/flashlight, /obj/random/dirt_75, /turf/simulated/floor/carpet/rubber, /area/shuttle/dominian_science_shuttle) "kAa" = ( /obj/structure/table/steel, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" @@ -4076,7 +4076,7 @@ /area/ship/dominian_science_vessel/armory) "lLG" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/purple{ dir = 5 }, @@ -4926,11 +4926,11 @@ "oBB" = ( /obj/item/storage/belt/archaeology, /obj/item/storage/box/unique/excavation, -/obj/item/device/flashlight/lantern, -/obj/item/device/ano_scanner, -/obj/item/device/depth_scanner, -/obj/item/device/core_sampler, -/obj/item/device/measuring_tape, +/obj/item/flashlight/lantern, +/obj/item/ano_scanner, +/obj/item/depth_scanner, +/obj/item/core_sampler, +/obj/item/measuring_tape, /obj/item/pickaxe/hand, /obj/item/storage/bag/fossils, /obj/item/stack/flag/green, @@ -5009,7 +5009,7 @@ "oGe" = ( /obj/structure/table/stone/marble, /obj/item/book/manual/dominia_honor, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /turf/simulated/floor/marble/dark, /area/ship/dominian_science_vessel/chapel) "oMn" = ( @@ -5580,7 +5580,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/dominian_science_vessel/armory) "qJb" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/carbondioxide{ pixel_x = -6 }, @@ -5734,12 +5734,12 @@ req_one_access = null }, /obj/structure/table/steel, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -5984,7 +5984,7 @@ /obj/item/clothing/accessory/holster/waist, /obj/item/clothing/accessory/holster/waist/brown, /obj/item/clothing/accessory/holster, -/obj/item/device/flash, +/obj/item/flash, /obj/item/clothing/suit/armor/carrier/heavy, /obj/item/clothing/head/helmet/merc, /obj/structure/sign/flag/dominia{ @@ -6964,7 +6964,7 @@ /area/ship/dominian_science_vessel/center_hall) "vfS" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/purple/full{ dir = 1 }, @@ -7914,7 +7914,7 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/dom, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /turf/simulated/floor/carpet, /area/ship/dominian_science_vessel/officer) "xue" = ( diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel_ghostroles.dm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel_ghostroles.dm index 79943b21970..7ce58a01adc 100644 --- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel_ghostroles.dm +++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel_ghostroles.dm @@ -29,7 +29,7 @@ id = /obj/item/card/id/house_volvalaad - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) @@ -60,7 +60,7 @@ back = /obj/item/storage/backpack/satchel id = /obj/item/card/id/house_volvalaad - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) @@ -94,7 +94,7 @@ back = /obj/item/storage/backpack/satchel id = /obj/item/card/id/house_volvalaad - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) @@ -126,7 +126,7 @@ back = /obj/item/storage/backpack/satchel id = /obj/item/card/id/house_volvalaad - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm index be9d11c6812..b4b1e4f93be 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm @@ -599,7 +599,7 @@ }, /obj/structure/table/standard, /obj/random/tech_supply, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 10; pixel_y = 5 }, @@ -2013,7 +2013,7 @@ /area/ship/dominian_unathi/eva) "oW" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/starboardthrust) "oY" = ( @@ -3256,7 +3256,7 @@ /area/ship/dominian_unathi) "xc" = ( /obj/structure/table/stone/marble, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/chapel) "xn" = ( @@ -7377,8 +7377,8 @@ dir = 9 }, /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled/dark, /area/ship/dominian_unathi/eva) "Yn" = ( @@ -7642,11 +7642,11 @@ /area/ship/dominian_unathi/cic) "ZK" = ( /obj/structure/table/rack, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/effect/floor_decal/corner/orange{ dir = 10 }, diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm index 8bb69a447ae..5481cb1df6d 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm @@ -26,12 +26,12 @@ shoes = /obj/item/clothing/shoes/sandals/caligae id = /obj/item/card/id back = /obj/item/storage/backpack/satchel - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list( /obj/item/storage/box/survival = 1, /obj/item/storage/box/unique/donkpockets = 1, - /obj/item/device/versebook/tribunal = 1, + /obj/item/versebook/tribunal = 1, /obj/item/shield/energy/dominia = 1 ) diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ghostroles.dm b/maps/away/ships/dpra/hailstorm/hailstorm_ghostroles.dm index 946524fd444..3bd26d43030 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ghostroles.dm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ghostroles.dm @@ -22,7 +22,7 @@ name = "People's Volunteer Spacer Militia Crew" id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship mask = /obj/item/clothing/accessory/dogtags/adhomai shoes = /obj/item/clothing/shoes/jackboots/tajara diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index 35d8485532e..efd81b20172 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -717,7 +717,7 @@ req_one_access = null; req_access = list(214) }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 8; pixel_y = 16 }, @@ -1006,11 +1006,11 @@ "fW" = ( /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = 8; pixel_y = 7 }, @@ -1434,7 +1434,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/intercom/expedition/hailing/east, +/obj/item/radio/intercom/expedition/hailing/east, /obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1698,12 +1698,12 @@ /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/random/dirt_75, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -2495,7 +2495,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 2 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 18; pixel_x = -2 }, @@ -2653,7 +2653,7 @@ pixel_y = 13 }, /obj/machinery/light/small, -/obj/item/device/versebook/dpra{ +/obj/item/versebook/dpra{ pixel_y = 2; pixel_x = 5 }, @@ -4069,7 +4069,7 @@ dir = 4; pixel_x = 32 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 8; pixel_y = 14 }, @@ -5599,7 +5599,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/device/versebook/dpra{ +/obj/item/versebook/dpra{ pixel_y = 2; pixel_x = 5 }, @@ -6592,15 +6592,15 @@ req_one_access = null; req_access = list(214) }, -/obj/item/device/camera_film/taj_film{ +/obj/item/camera_film/taj_film{ pixel_x = -4; pixel_y = -3 }, -/obj/item/device/camera_film/taj_film{ +/obj/item/camera_film/taj_film{ pixel_x = 4; pixel_y = -1 }, -/obj/item/device/camera/adhomai{ +/obj/item/camera/adhomai{ pixel_y = 7 }, /obj/random/dirt_75, @@ -7107,10 +7107,10 @@ /obj/random/dirt_75, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/standard, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -3 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5; pixel_x = -1 }, diff --git a/maps/away/ships/einstein/ee_spy_ship.dmm b/maps/away/ships/einstein/ee_spy_ship.dmm index a16e94d0124..8bd683093d0 100644 --- a/maps/away/ships/einstein/ee_spy_ship.dmm +++ b/maps/away/ships/einstein/ee_spy_ship.dmm @@ -88,7 +88,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/clothing/suit/space/void/einstein, /obj/item/clothing/head/helmet/space/void/einstein, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/ee_spy_ship) "aHs" = ( @@ -318,7 +318,7 @@ icon_state = "tube_empty" }, /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/window/reinforced{ dir = 4 }, @@ -715,7 +715,7 @@ /area/ship/ee_spy_ship) "lwj" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/blue, +/obj/item/flashlight/lamp/lava/blue, /turf/simulated/floor/carpet/rubber, /area/ship/ee_spy_ship) "lFg" = ( @@ -739,7 +739,7 @@ /area/ship/ee_spy_ship) "mwP" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/ship/ee_spy_ship) "mEc" = ( @@ -807,7 +807,7 @@ /area/shuttle/fsf_shuttle) "nty" = ( /obj/structure/table/steel, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/carpet/rubber, /area/ship/ee_spy_ship) "nzr" = ( @@ -819,7 +819,7 @@ /turf/simulated/floor/airless, /area/ship/ee_spy_ship) "nDn" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/steel, /turf/simulated/floor/carpet/rubber, /area/ship/ee_spy_ship) @@ -952,7 +952,7 @@ /area/ship/ee_spy_ship) "pXP" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/lava/green, +/obj/item/flashlight/lamp/lava/green, /turf/simulated/floor/carpet/rubber, /area/ship/ee_spy_ship) "pYB" = ( @@ -1065,7 +1065,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen/multi, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark, /area/ship/ee_spy_ship) "uaE" = ( @@ -1255,7 +1255,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/space/void/einstein, /obj/item/clothing/head/helmet/space/void/einstein, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/ee_spy_ship) "wZf" = ( diff --git a/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm b/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm index d19ccca6f85..6bdc0539652 100644 --- a/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm +++ b/maps/away/ships/einstein/ee_spy_ship_ghostroles.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/ee_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) @@ -64,7 +64,7 @@ id = /obj/item/card/id/ee_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm index 0c27fb4866f..ea426aa5070 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm @@ -57,7 +57,7 @@ pixel_y = 6; pixel_x = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 8; pixel_x = -6 }, @@ -455,7 +455,7 @@ /obj/structure/table/rack, /obj/item/hoist_kit, /obj/item/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/multitool, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -701,12 +701,12 @@ /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/ship/elyran_corvette/briefing) "dE" = ( @@ -1003,8 +1003,8 @@ /obj/item/handcuffs/ziptie, /obj/item/handcuffs/ziptie, /obj/item/handcuffs/ziptie, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/machinery/alarm/west{ req_one_access = null; req_access = list(207) @@ -1227,7 +1227,7 @@ dir = 10 }, /obj/item/stack/nanopaste, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/white, /area/ship/elyran_corvette/medbay) "gc" = ( @@ -1491,7 +1491,7 @@ dir = 1 }, /obj/structure/table/steel, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -6; pixel_y = 10 }, @@ -1959,7 +1959,7 @@ /obj/item/clothing/head/hardhat, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/safety/goggles, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/spline/plain/orange, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -2640,7 +2640,7 @@ /obj/item/clothing/head/radiation, /obj/item/clothing/suit/radiation, /obj/item/clothing/glasses/safety/goggles, -/obj/item/device/geiger, +/obj/item/geiger, /obj/machinery/light/colored/decayed{ dir = 8 }, @@ -3026,7 +3026,7 @@ pixel_x = 8; pixel_y = 9 }, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_x = -8; @@ -4415,7 +4415,7 @@ /obj/structure/table/rack, /obj/item/hoist_kit, /obj/item/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/multitool, /obj/effect/floor_decal/corner/yellow{ dir = 9 }, @@ -5503,7 +5503,7 @@ /obj/item/clothing/head/hardhat, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/safety/goggles, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/spline/plain/orange, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -6548,8 +6548,8 @@ dir = 1 }, /obj/machinery/light/colored/decayed, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /obj/structure/sign/flag/persepolis{ @@ -7248,13 +7248,13 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/colored/decayed, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/item/clothing/accessory/flagpatch/elyra, /obj/item/clothing/accessory/flagpatch/elyra, /obj/item/clothing/accessory/flagpatch/elyra, diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette_ghostroles.dm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette_ghostroles.dm index ac195786a1a..853fc48e844 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette_ghostroles.dm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette_ghostroles.dm @@ -29,7 +29,7 @@ id = /obj/item/card/id/elyran_corvette - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm index e3bef22e19f..ec3ffa92d1c 100644 --- a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm +++ b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm @@ -180,27 +180,27 @@ /area/ship/freebooter_salvager/toilets) "aP" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/flashlight/flare{ +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/flashlight/flare{ pixel_x = -9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = -9 }, /obj/effect/floor_decal/industrial/outline_door/operations{ @@ -2100,21 +2100,21 @@ /area/ship/freebooter_salvager/atmospherics) "jT" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 12 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 9; pixel_y = 12 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 6; pixel_x = 9 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 9 }, /obj/item/clothing/head/helmet/riot{ @@ -2516,7 +2516,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/steel, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark, @@ -2876,8 +2876,8 @@ req_access = null }, /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars, +/obj/item/binoculars/high_power{ pixel_y = 6 }, /obj/structure/cable{ @@ -2930,7 +2930,7 @@ /obj/item/ammo_magazine/boltaction, /obj/item/ammo_magazine/boltaction, /obj/item/gun/projectile/shotgun/pump/rifle, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/grenade/frag, /obj/random/civgun/rifle, /turf/simulated/floor/tiled/gridded, @@ -6865,9 +6865,9 @@ /obj/item/grenade/chem_grenade/metalfoam, /obj/item/stack/material/glass/full, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped{ dir = 1 @@ -7153,7 +7153,7 @@ /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/dark/full, /area/ship/freebooter_salvager/hydroponics) "Hd" = ( @@ -10827,13 +10827,13 @@ pixel_y = 4 }, /obj/item/storage/bag/ore, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -4 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -4 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_x = -4 }, /turf/simulated/floor/plating, diff --git a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dmm b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dmm index 7c7bef7d545..9a3eecc4139 100644 --- a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dmm +++ b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dmm @@ -550,7 +550,7 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialt, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/engineering) @@ -2911,11 +2911,11 @@ /area/ship/freebooter_ship/engineering) "lHL" = ( /obj/effect/decal/cleanable/generic, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, @@ -5595,11 +5595,11 @@ }, /obj/structure/railing/mapped, /obj/structure/table/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 12; pixel_y = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 10; pixel_x = -4 }, diff --git a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_ghostroles.dm b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_ghostroles.dm index caecae191aa..7fec0be5169 100644 --- a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_ghostroles.dm +++ b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_ghostroles.dm @@ -25,7 +25,7 @@ id = /obj/item/card/id/freebooter_crew_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm index e4a5fe39dc4..4df0d3f7a22 100644 --- a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm +++ b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm @@ -1503,9 +1503,9 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor, /area/ship/freebooter_ship/pod2) "ivW" = ( @@ -2471,7 +2471,7 @@ }, /obj/random/civgun/rifle, /obj/item/grenade/frag, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/ammo_magazine/boltaction, @@ -2674,7 +2674,7 @@ /obj/structure/closet/crate/bin{ name = "trashbin" }, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_x = 6; @@ -2893,7 +2893,7 @@ /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled/dark/full, /area/ship/freebooter_ship/pod5) "qpm" = ( @@ -3089,7 +3089,7 @@ /obj/effect/floor_decal/corner{ dir = 4 }, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_x = 5; pixel_y = 6 }, diff --git a/maps/away/ships/golden_deep/golden_deep.dmm b/maps/away/ships/golden_deep/golden_deep.dmm index b5e7a6033f0..d774874942a 100644 --- a/maps/away/ships/golden_deep/golden_deep.dmm +++ b/maps/away/ships/golden_deep/golden_deep.dmm @@ -65,8 +65,8 @@ dir = 1 }, /obj/structure/table/reinforced/steel, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer, +/obj/item/robotanalyzer{ pixel_y = 9 }, /turf/simulated/floor/tiled/dark/full, @@ -103,8 +103,8 @@ }, /obj/item/storage/belt/security/full/alt, /obj/item/storage/belt/security/full/alt, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/box/tactical/smokebombs, /obj/item/storage/box/tactical/flashbangs, /obj/item/storage/box/handcuffs, @@ -268,7 +268,7 @@ pixel_y = 4 }, /obj/random/dirt_75, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 4; pixel_y = 4 }, @@ -1083,7 +1083,7 @@ pixel_x = -7; pixel_y = 8 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 3; pixel_y = 6 }, @@ -1298,7 +1298,7 @@ pixel_x = 6; pixel_y = -3 }, -/obj/item/device/pin_extractor{ +/obj/item/pin_extractor{ pixel_x = 3; pixel_y = 10 }, @@ -1326,8 +1326,8 @@ "fv" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/reinforced/steel, -/obj/item/device/radio/intercom/hailing/north, -/obj/item/device/radio/hailing{ +/obj/item/radio/intercom/hailing/north, +/obj/item/radio/hailing{ pixel_x = 5; pixel_y = 6 }, @@ -2488,10 +2488,10 @@ pixel_y = 10; pixel_x = 7 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = -4 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = 5 }, /turf/simulated/floor/tiled/dark/full, @@ -3070,8 +3070,8 @@ /area/golden_deep/engineering) "nh" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars, +/obj/item/binoculars/high_power{ pixel_y = 6 }, /turf/simulated/floor/marble/dark, @@ -4071,7 +4071,7 @@ color = "#333333"; name = "leather gloves" }, -/obj/item/device/clothes_dyer, +/obj/item/clothes_dyer, /turf/simulated/floor/wood, /area/golden_deep/merchant) "qI" = ( @@ -4577,7 +4577,7 @@ must_start_working = 1 }, /obj/item/storage/toolbox/mechanical, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full, /area/golden_deep/eva) @@ -5155,7 +5155,7 @@ dir = 6 }, /obj/structure/table/reinforced/steel, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -2; pixel_y = 4 }, @@ -5177,11 +5177,11 @@ /area/golden_deep/owned_lounge) "vo" = ( /obj/structure/table/rack, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = -6; pixel_y = 2 }, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = 5; pixel_y = 2 }, @@ -5570,7 +5570,7 @@ /area/shuttle/golden_deep/passenger) "xi" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 10; pixel_x = 8 }, @@ -6228,7 +6228,7 @@ pixel_y = 18; pixel_x = -5 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -8; pixel_y = -3 }, @@ -6975,12 +6975,12 @@ "Dc" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, @@ -7370,7 +7370,7 @@ /turf/simulated/floor/plating, /area/golden_deep/atmos) "EF" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 5; pixel_x = 5 }, @@ -8474,7 +8474,7 @@ dir = 6 }, /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 1; pixel_y = -8 }, @@ -8711,12 +8711,12 @@ "Kd" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1; level = 2 @@ -9089,7 +9089,7 @@ dir = 10 }, /obj/structure/table/reinforced/steel, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_y = 5; pixel_x = 2 }, @@ -9984,7 +9984,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 17; pixel_x = 5 }, @@ -10233,7 +10233,7 @@ /obj/machinery/computer/ship/engines/terminal{ dir = 4 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /turf/simulated/floor/lino/diamond, /area/golden_deep/bridge) "Qd" = ( @@ -10361,7 +10361,7 @@ pixel_y = 4; pixel_x = 3 }, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_y = 5; pixel_x = -11 }, @@ -11110,11 +11110,11 @@ /obj/structure/noticeboard{ pixel_y = -30 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -6; pixel_y = 10 }, -/obj/item/device/debugger{ +/obj/item/debugger{ pixel_x = 7 }, /turf/simulated/floor/tiled/dark, @@ -11636,7 +11636,7 @@ /obj/structure/filingcabinet/chestdrawer{ pixel_x = -7 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /turf/simulated/floor/wood, /area/golden_deep/accounting) "VU" = ( @@ -11898,11 +11898,11 @@ dir = 6 }, /obj/structure/table/reinforced, -/obj/item/device/price_scanner{ +/obj/item/price_scanner{ pixel_y = 17; pixel_x = -2 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 2 }, /obj/random/dirt_75, @@ -12376,8 +12376,8 @@ req_one_access = list(229, 217) }, /obj/effect/floor_decal/industrial/outline/custodial, -/obj/item/device/hand_labeler, -/obj/item/device/price_scanner, +/obj/item/hand_labeler, +/obj/item/price_scanner, /turf/simulated/floor/marble/dark, /area/shuttle/golden_deep/cockpit) "YE" = ( diff --git a/maps/away/ships/golden_deep/golden_deep_ghostroles.dm b/maps/away/ships/golden_deep/golden_deep_ghostroles.dm index de9d709df6d..b5aa9e68d37 100644 --- a/maps/away/ships/golden_deep/golden_deep_ghostroles.dm +++ b/maps/away/ships/golden_deep/golden_deep_ghostroles.dm @@ -50,7 +50,7 @@ /obj/outfit/admin/golden_deep name = "Golden Deep Collective, Indentured Citizen" id = /obj/item/card/id/gold - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/satchel/eng r_pocket = /obj/item/storage/wallet/random uniform = /obj/item/clothing/under/goldendeep/porter diff --git a/maps/away/ships/golden_deep/golden_deep_submaps.dmm b/maps/away/ships/golden_deep/golden_deep_submaps.dmm index 2d64656f637..259d28371ad 100644 --- a/maps/away/ships/golden_deep/golden_deep_submaps.dmm +++ b/maps/away/ships/golden_deep/golden_deep_submaps.dmm @@ -32,19 +32,19 @@ "by" = ( /obj/random/dirt_75, /obj/structure/closet/cabinet, -/obj/item/device/versebook/trinary, -/obj/item/device/versebook/templeist, -/obj/item/device/versebook/gadpathur, -/obj/item/device/versebook/dpra, -/obj/item/device/versebook/biesel, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/assunzione, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/siakh, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/nka, +/obj/item/versebook/trinary, +/obj/item/versebook/templeist, +/obj/item/versebook/gadpathur, +/obj/item/versebook/dpra, +/obj/item/versebook/biesel, +/obj/item/versebook/autakh, +/obj/item/versebook/assunzione, +/obj/item/versebook/tribunal, +/obj/item/versebook/thakh, +/obj/item/versebook/skakh, +/obj/item/versebook/siakh, +/obj/item/versebook/pra, +/obj/item/versebook/nka, /turf/template_noop, /area/template_noop) "ci" = ( @@ -172,7 +172,7 @@ /obj/item/clothing/mask/skrell/thirdeye, /obj/item/clothing/mask/skrell/weeping, /obj/item/clothing/under/skrell/qeblak, -/obj/item/device/hearing_aid/skrell, +/obj/item/hearing_aid/skrell, /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha, /obj/item/skrell_projector, /obj/item/toy/plushie/axic, @@ -310,11 +310,11 @@ /obj/item/clothing/glasses/safety/goggles, /obj/structure/closet/toolcloset/empty, /obj/item/storage/belt/archaeology, -/obj/item/device/ano_scanner, +/obj/item/ano_scanner, /obj/item/storage/bag/fossils, -/obj/item/device/measuring_tape, -/obj/item/device/core_sampler, -/obj/item/device/depth_scanner, +/obj/item/measuring_tape, +/obj/item/core_sampler, +/obj/item/depth_scanner, /obj/item/storage/box/unique/excavation, /obj/item/book/manual/excavation, /obj/item/pickaxe/hand, @@ -581,14 +581,14 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/item/storage/box/autoinjectors, /obj/item/storage/box/inhalers_auto, /obj/random/dirt_75, @@ -681,7 +681,7 @@ /turf/template_noop, /area/template_noop) "Th" = ( -/obj/item/device/versebook/biesel, +/obj/item/versebook/biesel, /obj/item/storage/stickersheet/biesel, /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/biesel, /obj/item/clothing/suit/storage/legion/tcaf{ diff --git a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm index 87afa2402a7..55132e8ce04 100644 --- a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm +++ b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm @@ -2472,7 +2472,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/structure/table/wood, /turf/simulated/floor/wood/mahogany, /area/ship/fishing_trawler/Captain) @@ -2774,7 +2774,7 @@ /area/ship/fishing_trawler/corridor/port) "vf" = ( /obj/structure/table/wood, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_x = 6; @@ -3486,13 +3486,13 @@ /area/ship/fishing_trawler/corridor/starboard) "AQ" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -6; pixel_y = 6 }, /obj/effect/floor_decal/corner/black/full, -/obj/item/device/binoculars/high_power, -/obj/item/device/binoculars{ +/obj/item/binoculars/high_power, +/obj/item/binoculars{ pixel_y = 6 }, /turf/simulated/floor/tiled/dark, @@ -3746,7 +3746,7 @@ pixel_y = 6 }, /obj/item/clothing/gloves/yellow/specialu, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/firealarm/north, /obj/item/pipewrench, /obj/item/clothing/gloves/yellow/specialu, diff --git a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm index 613c1abebf0..1d0b4c23fcc 100644 --- a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm +++ b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm @@ -31,7 +31,7 @@ uniform = /obj/item/clothing/under/unathi shoes = /obj/item/clothing/shoes/workboots back = /obj/item/storage/backpack/satchel/hegemony - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship id = /obj/item/card/id/hephaestus backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index 552b0f5f8c1..ddeacc6813c 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -3571,22 +3571,22 @@ /area/hegemony_ship) "ve" = ( /obj/structure/table/standard, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/item/storage/bag/inflatable, /obj/machinery/firealarm/north, /obj/item/storage/bag/inflatable, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/tiled, /area/hegemony_ship/eva_storage) "vf" = ( @@ -6859,7 +6859,7 @@ dir = 4 }, /obj/structure/table/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -7; pixel_y = 7 }, @@ -7507,7 +7507,7 @@ pixel_y = 4; pixel_x = 1 }, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/hegemony_ship/gun_deck_bruiser) "RK" = ( @@ -8233,7 +8233,7 @@ pixel_y = -5 }, /obj/structure/table/glass, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /obj/structure/window/reinforced{ dir = 1 }, @@ -8245,7 +8245,7 @@ /turf/simulated/floor/plating, /area/hegemony_ship/trophy_room) "VB" = ( -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/spline/plain, /obj/machinery/button/distress{ diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm index 82143e49184..54c45539500 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm @@ -76,7 +76,7 @@ back = /obj/item/storage/backpack/satchel/hegemony - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -124,7 +124,7 @@ backpack_contents = list( /obj/item/storage/box/survival = 1, /obj/item/storage/box/unique/donkpockets = 1, - /obj/item/device/versebook/skakh = 1 + /obj/item/versebook/skakh = 1 ) diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm index 75828c5ff05..945a3ff4936 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm @@ -149,7 +149,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/mask/breath, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -1133,7 +1133,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/mask/breath, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -2274,7 +2274,7 @@ dir = 10 }, /obj/structure/table/standard, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /turf/simulated/floor/tiled, /area/merchants_guild/office) "EQ" = ( @@ -2992,7 +2992,7 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/mask/breath, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor/tiled, /area/merchants_guild/eva) "Nj" = ( @@ -3290,7 +3290,7 @@ }, /obj/structure/table/standard, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/merchants_guild/office) "TT" = ( @@ -3361,7 +3361,7 @@ /area/merchants_guild/starboardengine) "Uo" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/light, /obj/effect/floor_decal/corner/purple{ dir = 10 @@ -3671,7 +3671,7 @@ /area/merchants_guild/bridge) "ZW" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/orange, /area/merchants_guild/captain) diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm index 72c5e725737..2483f5e2241 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm @@ -22,7 +22,7 @@ name = "Merchants' Guild Freighter Crew" id = /obj/item/card/id shoes = /obj/item/clothing/shoes/sandals/caligae/socks - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/satchel/leather r_pocket = /obj/item/storage/wallet/random uniform = /obj/item/clothing/under/unathi diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_ghostroles.dm b/maps/away/ships/hegemony/miners_guild/miners_guild_ghostroles.dm index fd5549b6762..fac13344ddb 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_ghostroles.dm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_ghostroles.dm @@ -31,7 +31,7 @@ shoes = /obj/item/clothing/shoes/sandals/caligae/socks suit = /obj/item/clothing/accessory/poncho/unathimantle/miner back = /obj/item/storage/backpack/satchel/eng - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship id = /obj/item/card/id backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1) diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm index e0f51316701..dfba34a691f 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm @@ -4033,7 +4033,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 6 }, /turf/simulated/floor/tiled/steel, @@ -5172,16 +5172,16 @@ /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/effect/floor_decal/corner/brown/full, /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/light, /turf/simulated/floor/tiled/steel{ temperature = 278.15 @@ -6636,7 +6636,7 @@ /obj/item/clothing/head/helmet/space/void/mining, /obj/item/clothing/mask/breath, /obj/item/clothing/shoes/magboots, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /obj/effect/floor_decal/corner/brown{ dir = 5 }, diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm index c299169b662..78d6ad43445 100644 --- a/maps/away/ships/heph/cyclops/cyclops.dmm +++ b/maps/away/ships/heph/cyclops/cyclops.dmm @@ -953,8 +953,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/gps/mining, -/obj/item/device/suit_cooling_unit, +/obj/item/gps/mining, +/obj/item/suit_cooling_unit, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) @@ -3272,8 +3272,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/gps/mining, -/obj/item/device/suit_cooling_unit, +/obj/item/gps/mining, +/obj/item/suit_cooling_unit, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) @@ -3492,7 +3492,7 @@ /area/hephmining_ship/cyclops/cyclops_hangar) "DW" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/orange{ dir = 6 }, @@ -3632,8 +3632,8 @@ /obj/item/storage/belt/mining, /obj/item/pickaxe, /obj/item/storage/bag/ore, -/obj/item/device/gps/mining, -/obj/item/device/suit_cooling_unit, +/obj/item/gps/mining, +/obj/item/suit_cooling_unit, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) @@ -4640,7 +4640,7 @@ /area/hephmining_ship/cyclops/cyclops_barracks) "OE" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/orange{ dir = 5 }, @@ -5033,8 +5033,8 @@ /obj/item/clothing/shoes/magboots/vaurca, /obj/item/clothing/shoes/magboots/vaurca, /obj/item/clothing/shoes/magboots/vaurca, -/obj/item/device/gps/mining, -/obj/item/device/suit_cooling_unit, +/obj/item/gps/mining, +/obj/item/suit_cooling_unit, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, /area/hephmining_ship/cyclops) diff --git a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm index 1c45a87a3e2..bc314405851 100644 --- a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm +++ b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/hephaestus - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index ad5b8838584..3ef2b902aba 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -2520,7 +2520,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -2635,8 +2635,8 @@ dir = 1 }, /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /obj/effect/floor_decal/spline/plain/corner/black{ @@ -3068,7 +3068,7 @@ /obj/item/pen{ pixel_x = 6 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -7; pixel_y = 9 }, @@ -3655,7 +3655,7 @@ dir = 6 }, /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/glasses/safety/goggles, /obj/machinery/light{ dir = 4 @@ -4102,10 +4102,10 @@ /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/window/reinforced, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, @@ -4206,11 +4206,11 @@ /obj/item/melee/baton/loaded, /obj/item/melee/baton/loaded, /obj/item/melee/baton/loaded, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /obj/item/shield/energy, /obj/item/shield/energy, /obj/item/shield/energy, @@ -5612,7 +5612,7 @@ dir = 6 }, /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/clothing/glasses/safety/goggles, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark, diff --git a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm index 6f957d73281..37e8f7a9acb 100644 --- a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm +++ b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm @@ -24,7 +24,7 @@ head = /obj/item/clothing/head/hephaestus_military shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/combat - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship belt = /obj/item/storage/belt/military back = /obj/item/storage/backpack/satchel/heph id = /obj/item/card/id/hephaestus diff --git a/maps/away/ships/himeo/himeo_patrol_ship.dmm b/maps/away/ships/himeo/himeo_patrol_ship.dmm index 4d30b39f179..0cbea5a53d4 100644 --- a/maps/away/ships/himeo/himeo_patrol_ship.dmm +++ b/maps/away/ships/himeo/himeo_patrol_ship.dmm @@ -2,8 +2,8 @@ "ac" = ( /obj/random/dirt_75, /obj/structure/table/rack/folding_table, -/obj/item/device/binoculars/high_power, -/obj/item/device/binoculars{ +/obj/item/binoculars/high_power, +/obj/item/binoculars{ pixel_y = 8 }, /turf/simulated/floor/plating, @@ -3603,7 +3603,7 @@ /obj/item/clothing/head/bandana/engineering, /obj/item/clothing/head/beret/engineering, /obj/item/clothing/head/softcap/engineering, -/obj/item/device/magnetic_lock/engineering, +/obj/item/magnetic_lock/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, /obj/effect/floor_decal/corner/orange{ dir = 10 @@ -4142,28 +4142,28 @@ "rT" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/structure/extinguisher_cabinet/south, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "HPG"; gpstag = "HPG0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "HPG"; gpstag = "HPG0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "HPG"; gpstag = "HPG0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "HPG"; gpstag = "HPG0" }, @@ -4293,7 +4293,7 @@ "sg" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/desk/westright, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = -3; pixel_x = 6 }, @@ -4439,7 +4439,7 @@ pixel_x = 9; pixel_y = -4 }, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_y = 11; pixel_x = -6 }, @@ -5268,7 +5268,7 @@ pixel_y = 7; pixel_x = 7 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -5; pixel_x = -1 }, @@ -5590,7 +5590,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "HPG"; gpstag = "HPGPATROL"; pixel_y = 28; @@ -5883,7 +5883,7 @@ pixel_x = 4; pixel_y = 5 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -10 }, /turf/simulated/floor/tiled/dark, @@ -6549,7 +6549,7 @@ /obj/structure/fuel_port/hydrogen{ pixel_y = 32 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "HPG"; gpstag = "HPGSHUTTLE"; pixel_x = -24; @@ -8692,11 +8692,11 @@ "KY" = ( /obj/random/dirt_75, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/red{ +/obj/item/flashlight/lamp/lava/red{ pixel_x = 8; pixel_y = 14 }, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_x = -6; @@ -9003,8 +9003,8 @@ /obj/random/dirt_75, /obj/item/stack/material/steel/full, /obj/item/stack/rods/full, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, /obj/item/storage/bag/inflatable, /obj/structure/closet/walllocker{ pixel_x = 32; @@ -11671,7 +11671,7 @@ pixel_y = 3; pixel_x = -6 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 8; pixel_y = 4 }, diff --git a/maps/away/ships/himeo/himeo_patrol_ship_ghostroles.dm b/maps/away/ships/himeo/himeo_patrol_ship_ghostroles.dm index 8f5dad0a925..04488390ffe 100644 --- a/maps/away/ships/himeo/himeo_patrol_ship_ghostroles.dm +++ b/maps/away/ships/himeo/himeo_patrol_ship_ghostroles.dm @@ -95,10 +95,10 @@ uniform = /obj/item/clothing/under/himeo/navy gloves = /obj/item/clothing/gloves/fingerless shoes = /obj/item/clothing/shoes/workboots/dark - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/rucksack/green id = /obj/item/card/id/coalition - l_pocket = /obj/item/device/radio/off + l_pocket = /obj/item/radio/off backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, /obj/item/clothing/mask/gas/tactical = 1, diff --git a/maps/away/ships/himeo/himeo_patrol_ship_submaps.dmm b/maps/away/ships/himeo/himeo_patrol_ship_submaps.dmm index 6ed2a3babef..04d0fed1e47 100644 --- a/maps/away/ships/himeo/himeo_patrol_ship_submaps.dmm +++ b/maps/away/ships/himeo/himeo_patrol_ship_submaps.dmm @@ -135,7 +135,7 @@ "fU" = ( /obj/structure/table/rack/folding_table, /obj/item/weldingtool/hugetank, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_y = 13 }, /turf/simulated/floor/carpet/rubber, @@ -921,8 +921,8 @@ /area/template_noop) "Vn" = ( /obj/structure/closet/crate/drop, -/obj/item/device/paint_sprayer, -/obj/item/device/mmi/digital/posibrain, +/obj/item/paint_sprayer, +/obj/item/mmi/digital/posibrain, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, /obj/item/stack/nanopaste, diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index a2197733170..e0ab69415c6 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -716,10 +716,10 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/portdocking) "bfF" = ( -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 3 }, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/dark/full, /area/ship/iac_rescue_ship/bridge) @@ -1102,7 +1102,7 @@ /obj/item/stack/material/phoron{ amount = 6 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/storage/box/autoinjectors, /obj/item/storage/box/inhalers_auto, /obj/item/storage/box/inhalers_large, @@ -3016,11 +3016,11 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, @@ -3508,7 +3508,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/structure/table/reinforced/steel, /obj/item/storage/toolbox/electrical{ pixel_y = 10 @@ -3816,7 +3816,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/custodial) "hNm" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/storage/slide_projector, /obj/effect/floor_decal/spline/plain/black{ dir = 8 @@ -6337,7 +6337,7 @@ /obj/item/spacecash/c50, /obj/item/spacecash/c50, /obj/item/spacecash/c50, -/obj/item/device/advanced_healthanalyzer, +/obj/item/advanced_healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/reagent_containers/hypospray/cmo, /obj/item/clothing/under/rank/medical/surgeon, @@ -7179,7 +7179,7 @@ /area/ship/iac_rescue_ship/machinist) "qsF" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/full, @@ -8027,7 +8027,7 @@ }, /obj/item/storage/toolbox/mechanical, /obj/item/reagent_containers/glass/bucket, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/custodial) "sok" = ( @@ -8644,7 +8644,7 @@ /area/ship/iac_rescue_ship/bridge) "udB" = ( /obj/structure/table/wood, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_x = 6; @@ -9089,7 +9089,7 @@ pixel_x = -10; pixel_y = 7 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -7; pixel_y = 1 }, diff --git a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm index 3b3f3d621cc..baafad197ac 100644 --- a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm +++ b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm @@ -28,7 +28,7 @@ id = /obj/item/card/id/iac_rescue_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm index adb4d4f2fd6..8cf6a03d7b9 100644 --- a/maps/away/ships/idris/idris_cruiser.dmm +++ b/maps/away/ships/idris/idris_cruiser.dmm @@ -651,7 +651,7 @@ /obj/structure/bed/stool/chair/padded/teal{ dir = 8 }, -/obj/item/device/radio/intercom/locked/east, +/obj/item/radio/intercom/locked/east, /turf/simulated/floor/wood, /area/ship/idris_cruiser/corridor/civ_aft) "cS" = ( @@ -1778,7 +1778,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom/locked/north, +/obj/item/radio/intercom/locked/north, /turf/simulated/floor/carpet/green, /area/ship/idris_cruiser/corridor/starboard_lobby) "hn" = ( @@ -1990,11 +1990,11 @@ dir = 9 }, /obj/structure/table/reinforced/steel, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 4; pixel_x = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 4; pixel_x = 6 }, @@ -2024,7 +2024,7 @@ /area/ship/idris_cruiser/corridor/dockingarm/port) "ii" = ( /obj/structure/table/reinforced/wood, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/ship/idris_cruiser/corridor/lobby) "im" = ( @@ -2733,10 +2733,10 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = 4 }, -/obj/item/device/suit_cooling_unit{ +/obj/item/suit_cooling_unit{ pixel_y = 4 }, /obj/item/tank/jetpack/carbondioxide, @@ -3079,8 +3079,8 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/item/tank/jetpack/carbondioxide, @@ -3334,10 +3334,10 @@ /obj/item/pen/fountain/black, /obj/item/pen/fountain/black, /obj/item/pen/fountain/black, -/obj/item/device/toner, -/obj/item/device/toner, -/obj/item/device/toner, -/obj/item/device/toner, +/obj/item/toner, +/obj/item/toner, +/obj/item/toner, +/obj/item/toner, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/full, /area/ship/idris_cruiser/cargo_bay) @@ -3580,7 +3580,7 @@ /obj/machinery/light/floor{ dir = 4 }, -/obj/item/device/radio/intercom/locked/north, +/obj/item/radio/intercom/locked/north, /turf/simulated/floor/wood, /area/ship/idris_cruiser/great_room) "ny" = ( @@ -3902,7 +3902,7 @@ /obj/machinery/alarm/east{ req_one_access = list(220) }, -/obj/item/device/lightreplacer/advanced{ +/obj/item/lightreplacer/advanced{ pixel_y = 10; pixel_x = 9 }, @@ -4229,27 +4229,27 @@ }, /obj/effect/floor_decal/industrial/outline/security, /obj/item/storage/box/fancy/donut, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -1 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -1 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -1 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -1 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 2; pixel_y = 10 }, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, -/obj/item/device/taperecorder, -/obj/item/device/taperecorder, +/obj/item/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/full, /area/ship/idris_cruiser/security) "pE" = ( @@ -4408,15 +4408,15 @@ pixel_y = 15; pixel_x = 1 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 4; pixel_x = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 4; pixel_x = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 4; pixel_x = 6 }, @@ -4621,7 +4621,7 @@ pixel_y = 4; req_one_access = list(220) }, -/obj/item/device/radio/intercom/ship/north, +/obj/item/radio/intercom/ship/north, /turf/simulated/floor/tiled/dark/full, /area/ship/idris_cruiser/bridge) "qT" = ( @@ -6065,7 +6065,7 @@ dir = 4 }, /obj/random/pottedplant, -/obj/item/device/radio/intercom/locked/west, +/obj/item/radio/intercom/locked/west, /turf/simulated/floor/wood, /area/ship/idris_cruiser/corridor/civ_fore) "vJ" = ( @@ -6518,19 +6518,19 @@ /obj/structure/closet/crate{ name = "vendor refill crate" }, -/obj/item/device/vending_refill/booze, -/obj/item/device/vending_refill/cola, -/obj/item/device/vending_refill/cola, -/obj/item/device/vending_refill/cola, -/obj/item/device/vending_refill/cutlery, -/obj/item/device/vending_refill/cutlery, -/obj/item/device/vending_refill/hydro, -/obj/item/device/vending_refill/meds, -/obj/item/device/vending_refill/seeds, -/obj/item/device/vending_refill/snack, -/obj/item/device/vending_refill/snack, -/obj/item/device/vending_refill/snack, -/obj/item/device/vending_refill/snack, +/obj/item/vending_refill/booze, +/obj/item/vending_refill/cola, +/obj/item/vending_refill/cola, +/obj/item/vending_refill/cola, +/obj/item/vending_refill/cutlery, +/obj/item/vending_refill/cutlery, +/obj/item/vending_refill/hydro, +/obj/item/vending_refill/meds, +/obj/item/vending_refill/seeds, +/obj/item/vending_refill/snack, +/obj/item/vending_refill/snack, +/obj/item/vending_refill/snack, +/obj/item/vending_refill/snack, /obj/machinery/alarm/north{ req_one_access = list(220) }, @@ -8201,7 +8201,7 @@ pixel_y = -2; pixel_x = 5 }, -/obj/item/device/radio/intercom/ship/west, +/obj/item/radio/intercom/ship/west, /turf/simulated/floor/tiled, /area/ship/idris_cruiser/security) "Dz" = ( @@ -8320,7 +8320,7 @@ /obj/item/pen/fountain/silver{ pixel_x = -2 }, -/obj/item/device/cratescanner{ +/obj/item/cratescanner{ pixel_y = 5 }, /obj/item/storage/secure/safe{ @@ -9469,7 +9469,7 @@ "ID" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/item/device/radio/intercom/ship/east, +/obj/item/radio/intercom/ship/east, /turf/simulated/floor/plating, /area/ship/idris_cruiser/engineering) "IE" = ( @@ -9675,7 +9675,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/item/device/radio/intercom/locked/north, +/obj/item/radio/intercom/locked/north, /turf/simulated/floor/carpet/green, /area/ship/idris_cruiser/corridor/suites_b) "Jr" = ( @@ -9972,7 +9972,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/item/device/radio/intercom/locked/north, +/obj/item/radio/intercom/locked/north, /turf/simulated/floor/carpet/green, /area/ship/idris_cruiser/corridor/suites_a) "Kc" = ( @@ -12418,12 +12418,12 @@ /obj/item/stack/cable_coil/green{ pixel_x = -8 }, -/obj/item/device/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, /obj/item/storage/box/fancy/crayons/chalkbox{ pixel_y = 8 }, /obj/item/blueprints, -/obj/item/device/radio/intercom/ship/west, +/obj/item/radio/intercom/ship/west, /turf/simulated/floor/plating, /area/ship/idris_cruiser/engineering) "SB" = ( @@ -12463,8 +12463,8 @@ /obj/item/clothing/shoes/workboots, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/item/clothing/accessory/armband/idris, /obj/item/clothing/accessory/armband/idris, /obj/item/clothing/accessory/storage/overalls/engineer, @@ -12546,7 +12546,7 @@ /area/ship/idris_cruiser/corridor/suites_a) "SY" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -11; pixel_y = 2 }, @@ -13615,11 +13615,11 @@ /turf/simulated/floor/tiled, /area/ship/idris_cruiser/engineering) "Xd" = ( -/obj/item/device/synthesized_instrument/violin, -/obj/item/device/synthesized_instrument/trumpet, -/obj/item/device/synthesized_instrument/synthesizer, -/obj/item/device/synthesized_instrument/guitar/multi, -/obj/item/device/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/violin, +/obj/item/synthesized_instrument/trumpet, +/obj/item/synthesized_instrument/synthesizer, +/obj/item/synthesized_instrument/guitar/multi, +/obj/item/synthesized_instrument/guitar, /obj/structure/closet/secure_closet{ name = "instruments locker"; req_access = list(220) diff --git a/maps/away/ships/idris/idris_cruiser_ghostroles.dm b/maps/away/ships/idris/idris_cruiser_ghostroles.dm index d5e250c1b5a..b96ecd4beb1 100644 --- a/maps/away/ships/idris/idris_cruiser_ghostroles.dm +++ b/maps/away/ships/idris/idris_cruiser_ghostroles.dm @@ -37,7 +37,7 @@ name = "Idris Cruise Crew Member" uniform = /obj/item/clothing/under/librarian/idris shoes = /obj/item/clothing/shoes/laceup - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/satchel/leather id = /obj/item/card/id/idris l_pocket = /obj/item/reagent_containers/glass/rag/advanced/idris diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index f1eb12015f7..64b5c70d6e0 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -2037,7 +2037,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fountain/black, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 9 }, /obj/effect/floor_decal/spline/fancy/wood, @@ -2392,18 +2392,18 @@ /area/kataphract_chapter/portentry) "iW" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -4240,7 +4240,7 @@ /area/shuttle/kataphract_shuttle/main_compartment) "rL" = ( /obj/structure/table/wood, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /obj/item/storage/pill_bottle/dice, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -4398,7 +4398,7 @@ /obj/structure/table/reinforced/steel, /obj/item/storage/bag/inflatable, /obj/item/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/kataphract_chapter/armoury) "sZ" = ( @@ -4795,7 +4795,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fountain/black, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 9 }, /obj/effect/floor_decal/spline/fancy/wood{ diff --git a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm index e1c972018a8..7d6a4aab531 100644 --- a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm +++ b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm @@ -79,7 +79,7 @@ back = /obj/item/storage/backpack/satchel/hegemony - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list( /obj/item/storage/box/unique/donkpockets = 1 diff --git a/maps/away/ships/konyang/air_konyang/air_konyang_ghostroles.dm b/maps/away/ships/konyang/air_konyang/air_konyang_ghostroles.dm index 5192cff4287..e58a86bc566 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang_ghostroles.dm +++ b/maps/away/ships/konyang/air_konyang/air_konyang_ghostroles.dm @@ -38,7 +38,7 @@ back = /obj/item/storage/backpack/satchel id = /obj/item/card/id l_pocket = /obj/item/storage/wallet/random - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship /obj/outfit/admin/konyang/civ name = "Konyanger Civilian" diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm index 60b384532d8..64486dfaf9b 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm @@ -137,7 +137,7 @@ id = /obj/item/card/id/einstein - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm index a812b6f4ca8..efa88b89e05 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm @@ -426,7 +426,7 @@ pixel_x = -8; pixel_y = 9 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 4; on = 1 }, @@ -712,7 +712,7 @@ req_one_access = null }, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/oxygen/yellow, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/shoes/magboots, @@ -1495,7 +1495,7 @@ dir = 6 }, /obj/structure/table/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 6 }, /turf/simulated/floor/tiled/dark/full, @@ -1510,7 +1510,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 12; pixel_x = 8 }, @@ -1564,7 +1564,7 @@ "mL" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/oxygen/yellow, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space, @@ -1892,7 +1892,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/item/device/radio/intercom/hailing/west, +/obj/item/radio/intercom/hailing/west, /turf/simulated/floor/tiled/dark/full, /area/ship/ipc_refugee/bridge) "oA" = ( @@ -2350,7 +2350,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/device/radio/intercom/hailing/east, +/obj/item/radio/intercom/hailing/east, /obj/structure/bed/stool/chair/shuttle, /turf/simulated/floor/tiled/dark/full, /area/shuttle/ipc_refugee_shuttle) @@ -3059,7 +3059,7 @@ pixel_x = -8; pixel_y = 9 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 4; on = 1 }, @@ -3203,9 +3203,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/structure/table/rack, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = 8 }, /turf/simulated/floor/tiled/dark/full, @@ -3382,7 +3382,7 @@ dir = 6 }, /obj/effect/decal/cleanable/blood/drip/oil, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 12; pixel_x = 8 }, @@ -4216,7 +4216,7 @@ icon_state = "0-8" }, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/oxygen/yellow, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical, @@ -5579,7 +5579,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /turf/simulated/floor/tiled/dark, /area/ship/ipc_refugee/cargopod_b) "RD" = ( @@ -5735,7 +5735,7 @@ dir = 10 }, /obj/effect/decal/cleanable/blood/drip/oil, -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /turf/simulated/floor/tiled/dark, /area/ship/ipc_refugee/cargopod_a) "Te" = ( @@ -6364,7 +6364,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 12; pixel_x = 8 }, @@ -6576,7 +6576,7 @@ "Yw" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/oxygen/yellow, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/mining, diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm index 4bfb1568c9e..acfe2b10259 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm @@ -29,8 +29,8 @@ backpack_contents = list( /obj/item/storage/box/survival = 1, - /obj/item/device/radio/map_preset = 1, - /obj/item/device/flashlight = 1, + /obj/item/radio/map_preset = 1, + /obj/item/flashlight = 1, /obj/item/storage/wallet = 1, /obj/item/clothing/accessory/badge/passport/sol = 1, /obj/item/spacecash/c200 = 1, @@ -65,8 +65,8 @@ backpack_contents = list( /obj/item/storage/box/survival = 1, - /obj/item/device/radio/map_preset = 1, - /obj/item/device/flashlight = 1, + /obj/item/radio/map_preset = 1, + /obj/item/flashlight = 1, /obj/item/storage/wallet = 1 ) diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm index 5aa8ee9d096..11f8d5c1fba 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm @@ -562,7 +562,7 @@ /obj/item/clothing/head/welding{ pixel_x = 4 }, -/obj/item/device/robotanalyzer{ +/obj/item/robotanalyzer{ pixel_y = -8 }, /obj/structure/table/standard, @@ -1898,7 +1898,7 @@ name = "Shuttle Safety Shutters"; pixel_y = 10 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -4; pixel_y = 2 }, @@ -1906,7 +1906,7 @@ pixel_y = 10; pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 6; pixel_y = -2 }, @@ -2282,7 +2282,7 @@ /obj/item/clothing/glasses/safety/goggles{ pixel_y = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 4 }, /turf/simulated/floor/carpet/rubber, @@ -2549,7 +2549,7 @@ pixel_x = 4; pixel_y = 12 }, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, @@ -5013,7 +5013,7 @@ /obj/structure/table/rack, /obj/item/hoist_kit, /obj/item/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/carpet/rubber, /area/ship/kasf_corvette/starboardwep) "CU" = ( @@ -5281,7 +5281,7 @@ /obj/item/clothing/glasses/safety/goggles{ pixel_y = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 4 }, /turf/simulated/floor/carpet/rubber, @@ -5985,7 +5985,7 @@ pixel_y = -2; pixel_x = -4 }, -/obj/item/device/electronic_assembly/simple{ +/obj/item/electronic_assembly/simple{ desc = "The remote for a PanaVision 2400. This one feels a bit hollow."; name = "television remote"; pixel_y = 7; @@ -6242,8 +6242,8 @@ /obj/item/handcuffs/ziptie, /obj/item/handcuffs/ziptie, /obj/item/handcuffs/ziptie, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/item/grenade/flashbang, /obj/item/grenade/flashbang, /obj/item/gun/energy/rifle/ionrifle, @@ -7469,20 +7469,20 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/full, /area/ship/kasf_corvette/armory) @@ -7610,14 +7610,14 @@ /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 5 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark/full, @@ -7707,7 +7707,7 @@ /obj/structure/table/rack, /obj/item/hoist_kit, /obj/item/storage/toolbox/mechanical, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/carpet/rubber, /area/ship/kasf_corvette/portwep) "RA" = ( @@ -8268,7 +8268,7 @@ /obj/item/clothing/head/radiation, /obj/item/clothing/suit/radiation, /obj/item/clothing/glasses/safety/goggles, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/carpet/rubber, /area/ship/kasf_corvette/engie) "Vv" = ( diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship_ghostroles.dm b/maps/away/ships/konyang/kasf_ship/kasf_ship_ghostroles.dm index b418940cdce..7b6c0651122 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship_ghostroles.dm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship_ghostroles.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/kasf_corvette - l_ear = /obj/item/device/radio/headset/ship/coalition_navy + l_ear = /obj/item/radio/headset/ship/coalition_navy backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm index f41e7a9407e..ced3e35bb65 100644 --- a/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm +++ b/maps/away/ships/konyang/konyang_wreck/konyang_wreck.dmm @@ -341,7 +341,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, /obj/machinery/light, /turf/simulated/floor/tiled/dark, @@ -1071,7 +1071,7 @@ /area/konyang_wreck/mechbay) "io" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/captain) @@ -1527,7 +1527,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, /obj/machinery/light{ dir = 4; @@ -4801,7 +4801,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/gas, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/atmos) "PH" = ( @@ -5514,7 +5514,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled/dark, /area/konyang_wreck/engineering) diff --git a/maps/away/ships/konyang/water_barge/water_barge.dmm b/maps/away/ships/konyang/water_barge/water_barge.dmm index 19d80664f98..eb2cf239d03 100644 --- a/maps/away/ships/konyang/water_barge/water_barge.dmm +++ b/maps/away/ships/konyang/water_barge/water_barge.dmm @@ -3067,7 +3067,7 @@ /turf/simulated/floor/tiled/dark, /area/water_barge/dockingport/port) "Eo" = ( -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 12; pixel_x = -7 }, @@ -3078,15 +3078,15 @@ /obj/item/storage/bag/inflatable, /obj/item/storage/bag/inflatable, /obj/machinery/recharger, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 12; pixel_x = 2 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 12; pixel_x = -2 }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ pixel_y = 12; pixel_x = 6 }, diff --git a/maps/away/ships/lone_spacer/lone_spacer.dmm b/maps/away/ships/lone_spacer/lone_spacer.dmm index db2048a3418..f7cd589438f 100644 --- a/maps/away/ships/lone_spacer/lone_spacer.dmm +++ b/maps/away/ships/lone_spacer/lone_spacer.dmm @@ -117,12 +117,12 @@ pixel_x = 23 }, /obj/item/clothing/head/welding, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/effect/decal/cleanable/dirt, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/suit/space, /obj/item/clothing/head/helmet/space, /obj/item/clothing/shoes/magboots, @@ -456,7 +456,7 @@ /area/shuttle/lone_spacer/port_nacelle) "eT" = ( /obj/structure/table/rack, -/obj/item/device/geiger{ +/obj/item/geiger{ pixel_x = -5; pixel_y = 6 }, @@ -582,7 +582,7 @@ /obj/structure/sign/poster{ pixel_y = -32 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 4; pixel_x = -8 }, @@ -591,11 +591,11 @@ pixel_x = -6; pixel_y = 9 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 11; pixel_y = -4 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = 11; pixel_y = 2 }, @@ -687,7 +687,7 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/lone_spacer/storage) "hH" = ( -/obj/item/device/paicard, +/obj/item/paicard, /obj/structure/closet/cabinet, /obj/item/clothing/accessory/storage/pouches/brown, /obj/machinery/power/apc/north{ @@ -724,12 +724,12 @@ /obj/item/clothing/head/kippah, /obj/item/clothing/head/softcap/himeo, /obj/item/clothing/suit/storage/toggle/himeo, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/item/clothing/accessory/dominia, /obj/item/clothing/under/dominia/imperial_suit/black, /obj/item/clothing/mask/trinary_mask, /obj/item/clothing/accessory/badge/trinary, -/obj/item/device/versebook/trinary, +/obj/item/versebook/trinary, /obj/item/clothing/accessory/poncho/trinary/shouldercape, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/under/unathi, @@ -836,7 +836,7 @@ /area/shuttle/lone_spacer/starboard_nacelle) "iW" = ( /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -5; pixel_y = 8 }, @@ -1539,10 +1539,10 @@ pixel_y = 11; pixel_x = -7 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -4 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 6 }, /obj/effect/decal/cleanable/dirt, @@ -1752,7 +1752,7 @@ dir = 4; req_access = list(243) }, -/obj/item/device/radio/intercom/expedition/hailing/north{ +/obj/item/radio/intercom/expedition/hailing/north{ pixel_y = 19 }, /obj/effect/decal/cleanable/dirt, @@ -1840,7 +1840,7 @@ pixel_x = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = -5; pixel_x = 5 }, @@ -2693,11 +2693,11 @@ sensors = list("lone_spacer_containment_1_sensor") }, /obj/item/storage/belt/archaeology, -/obj/item/device/ano_scanner, +/obj/item/ano_scanner, /obj/item/storage/bag/fossils, -/obj/item/device/measuring_tape, -/obj/item/device/core_sampler, -/obj/item/device/depth_scanner, +/obj/item/measuring_tape, +/obj/item/core_sampler, +/obj/item/depth_scanner, /obj/item/storage/box/unique/excavation, /obj/item/book/manual/excavation, /obj/item/pickaxe/hand, @@ -2892,7 +2892,7 @@ pixel_y = 2; pixel_x = -5 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 11; pixel_x = -16 }, @@ -2903,7 +2903,7 @@ pixel_x = 7; pixel_y = 11 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = -3 }, @@ -3029,7 +3029,7 @@ /area/shuttle/lone_spacer/storage) "VO" = ( /obj/structure/table/standard, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_y = 13; pixel_x = 6 }, @@ -3134,7 +3134,7 @@ pixel_y = -2 }, /obj/effect/decal/cleanable/dirt, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 15; pixel_x = 8 }, diff --git a/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm b/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm index dc737a1ca74..3c7a096d890 100644 --- a/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm +++ b/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm @@ -25,7 +25,7 @@ id = /obj/item/card/id/lone_spacer_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm b/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm index e0836c0ce3c..c0667fed868 100644 --- a/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm +++ b/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm @@ -159,27 +159,27 @@ dir = 4 }, /obj/structure/closet/crate/drop, -/obj/item/device/mmi, +/obj/item/mmi, /obj/item/stack/cable_coil/blue, /obj/item/stack/cable_coil, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/ipc_tag_scanner, /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, -/obj/item/device/assembly/prox_sensor, -/obj/item/device/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/firstaid/empty, /obj/item/storage/firstaid/empty, /obj/item/robot_parts/head, /obj/item/stock_parts/manipulator, -/obj/item/device/mmi/digital/posibrain, +/obj/item/mmi/digital/posibrain, /obj/item/reagent_containers/spray/cleaner, /obj/item/robot_parts/r_arm, /obj/item/robot_parts/r_arm, /obj/effect/decal/cleanable/dirt, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /turf/simulated/floor/tiled/dark/full, /area/shuttle/lone_spacer/storage) "t" = ( @@ -318,14 +318,14 @@ "J" = ( /obj/effect/floor_decal/industrial/outline/operations, /obj/structure/closet/crate/drop, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm index 5fe62fd052b..7c91af7e8af 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm @@ -73,7 +73,7 @@ /area/nka_merchant/bridge) "ak" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/lava/blue, +/obj/item/flashlight/lamp/lava/blue, /obj/effect/floor_decal/corner/white{ dir = 5 }, @@ -1422,7 +1422,7 @@ /area/nka_merchant/hangar) "em" = ( /obj/structure/table/standard, -/obj/item/device/versebook/nka, +/obj/item/versebook/nka, /obj/structure/sign/flag/nka/large/south{ pixel_y = -32 }, @@ -1568,7 +1568,7 @@ /area/nka_merchant/hangar) "fi" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /obj/structure/railing/mapped{ dir = 8 }, @@ -2400,10 +2400,10 @@ /obj/structure/sign/flag/nka{ pixel_y = 32 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5 }, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -2461,7 +2461,7 @@ }, /obj/structure/table/standard, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -2539,7 +2539,7 @@ "jE" = ( /obj/structure/table/standard, /obj/item/toy/comic/azmarian/issue_4, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 12; pixel_x = -7 }, @@ -2653,7 +2653,7 @@ name = "radiation suit locker"; pixel_x = -32 }, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/clothing/glasses/safety/goggles, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, @@ -3686,11 +3686,11 @@ /area/nka_merchant/mess) "rq" = ( /obj/structure/table/rack, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/effect/floor_decal/corner/white/full{ dir = 1 }, @@ -4779,7 +4779,7 @@ }, /area/nka_merchant/engine) "Eg" = ( -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -6; pixel_y = 12 }, @@ -4787,8 +4787,8 @@ /obj/machinery/recharger/wallcharger{ pixel_y = 24 }, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /obj/machinery/light{ dir = 1 }, @@ -5235,7 +5235,7 @@ }, /obj/structure/closet/crate/internals, /obj/item/storage/bag/inflatable, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/tank/emergency_oxygen{ pixel_x = 5 }, @@ -5264,12 +5264,12 @@ }, /area/nka_merchant/warehouse) "Jv" = ( -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -5781,7 +5781,7 @@ req_access = list(213) }, /obj/effect/floor_decal/corner/brown/full, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/standard, /obj/structure/cable/green, /turf/simulated/floor/tiled{ diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant_ghostroles.dm b/maps/away/ships/nka/nka_merchant/nka_merchant_ghostroles.dm index 0d1a45b52f0..3265bee581d 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant_ghostroles.dm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant_ghostroles.dm @@ -25,7 +25,7 @@ uniform = /obj/item/clothing/under/tajaran/nka_merchant_navy head = /obj/item/clothing/head/tajaran/nka_merchant_navy - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/satchel/leather r_pocket = /obj/item/storage/wallet/random diff --git a/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm index 00ef69fad56..313767b7f87 100644 --- a/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm +++ b/maps/away/ships/orion/orion_express_ship/orion_express_ship.dmm @@ -1174,19 +1174,19 @@ /obj/item/storage/toolbox/mechanical{ pixel_x = 9 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 3; pixel_x = -9 }, @@ -1549,7 +1549,7 @@ /area/shuttle/orion_shuttle/storage) "fau" = ( /obj/machinery/computer/shuttle_control/explore/orion_express_shuttle, -/obj/item/device/radio/intercom/expedition/hailing/west, +/obj/item/radio/intercom/expedition/hailing/west, /turf/simulated/floor/tiled/dark/full, /area/shuttle/orion_shuttle/cockpit) "fbf" = ( @@ -1852,7 +1852,7 @@ /obj/item/pen{ pixel_x = -2 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -7; pixel_y = 15; brightness_level = "low" @@ -3058,7 +3058,7 @@ "kog" = ( /obj/effect/decal/cleanable/dirt, /obj/random/pottedplant, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "ORION"; gpstag = "ORIONSHUTTLE"; pixel_x = -24 @@ -3572,7 +3572,7 @@ /obj/effect/floor_decal/corner_wide/beige{ dir = 10 }, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/ship/orion/bridge) "mkT" = ( @@ -3869,7 +3869,7 @@ /turf/simulated/floor, /area/ship/orion/docking1) "nnl" = ( -/obj/item/device/assembly/mousetrap/armed, +/obj/item/assembly/mousetrap/armed, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -4247,7 +4247,7 @@ /obj/machinery/recharger{ pixel_x = 6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 9; pixel_x = -3 }, @@ -5660,8 +5660,8 @@ /turf/simulated/floor, /area/ship/orion/docking1) "sIh" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, @@ -5674,11 +5674,11 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ gps_prefix = "ORION"; gpstag = "ORION0" }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ gps_prefix = "ORION"; gpstag = "ORION0" }, @@ -6152,7 +6152,7 @@ /obj/machinery/light{ inserted_light = /obj/item/light/tube/colored/blue }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gps_prefix = "ORION"; gpstag = "ORIONBASE"; pixel_y = -24; @@ -6340,8 +6340,8 @@ /turf/simulated/floor/airless, /area/ship/orion/thruster1) "uyk" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/item/clothing/shoes/magboots, @@ -6351,11 +6351,11 @@ /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ gps_prefix = "ORION"; gpstag = "ORION0" }, -/obj/item/device/gps/engineering{ +/obj/item/gps/engineering{ gps_prefix = "ORION"; gpstag = "ORION0" }, @@ -7028,7 +7028,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 6; pixel_x = 3 }, diff --git a/maps/away/ships/orion/orion_express_ship/orion_express_ship_ghostroles.dm b/maps/away/ships/orion/orion_express_ship/orion_express_ship_ghostroles.dm index 42f4ceed188..b346a4f8dcc 100644 --- a/maps/away/ships/orion/orion_express_ship/orion_express_ship_ghostroles.dm +++ b/maps/away/ships/orion/orion_express_ship/orion_express_ship_ghostroles.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/orion_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1) species_shoes = list( diff --git a/maps/away/ships/orion/orion_miner/orion_miner.dmm b/maps/away/ships/orion/orion_miner/orion_miner.dmm index caa9c933f29..550d0673a10 100644 --- a/maps/away/ships/orion/orion_miner/orion_miner.dmm +++ b/maps/away/ships/orion/orion_miner/orion_miner.dmm @@ -310,7 +310,7 @@ }, /obj/machinery/recharge_station, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/item/device/gps/stationary/mining_shuttle{ +/obj/item/gps/stationary/mining_shuttle{ pixel_y = 27; name = "static GPS (Orion Miner)"; gpstag = "OMINER"; @@ -1610,7 +1610,7 @@ pixel_x = 8; pixel_y = 4 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -6; pixel_y = 3 }, @@ -3853,10 +3853,10 @@ "HN" = ( /obj/structure/table/reinforced/steel, /obj/item/storage/toolbox/mechanical, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 10 }, /turf/simulated/floor/tiled/dark, @@ -5290,10 +5290,10 @@ /area/shuttle/orion_miner/corridor) "Un" = ( /obj/structure/table/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/machinery/light/colored/decayed, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, @@ -5439,19 +5439,19 @@ /area/shuttle/orion_miner/main_engineering_port) "VZ" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = -8; pixel_y = 12 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = -8; pixel_y = 8 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = -8 }, /obj/item/plastique/seismic{ @@ -5462,11 +5462,11 @@ pixel_x = 10; pixel_y = 6 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_x = -5; pixel_y = -3 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_x = -5; pixel_y = -11 }, @@ -5697,7 +5697,7 @@ /obj/structure/table/rack, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /turf/simulated/floor/tiled, /area/shuttle/orion_miner/tech_storage) "XX" = ( @@ -5837,7 +5837,7 @@ /obj/machinery/light/colored/red, /obj/machinery/telecomms/allinone/ship, /obj/effect/floor_decal/industrial/hatch/security, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -7; pixel_y = 5 }, diff --git a/maps/away/ships/orion/orion_miner/orion_miner_ghostroles.dm b/maps/away/ships/orion/orion_miner/orion_miner_ghostroles.dm index 9615c393d02..74a2d23cb2f 100644 --- a/maps/away/ships/orion/orion_miner/orion_miner_ghostroles.dm +++ b/maps/away/ships/orion/orion_miner/orion_miner_ghostroles.dm @@ -28,7 +28,7 @@ id = /obj/item/card/id/orion/miner - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1) species_shoes = list( diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index eda19f31592..d0345dd4480 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -1220,7 +1220,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen/multi, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/corner/red{ dir = 8 }, @@ -1684,19 +1684,19 @@ }, /area/database_freighter/bridge) "hk" = ( -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/structure/table/standard, /obj/structure/extinguisher_cabinet/north, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2386,7 +2386,7 @@ /area/database_freighter/hangar) "kU" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet/art{ temperature = 278.15 @@ -4061,7 +4061,7 @@ }, /obj/item/paper_bin, /obj/item/pen/multi, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4201,7 +4201,7 @@ }, /obj/structure/closet/crate/internals, /obj/item/storage/bag/inflatable, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/tank/emergency_oxygen{ pixel_x = 5 }, @@ -4898,7 +4898,7 @@ /area/database_freighter/engineering) "Th" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, diff --git a/maps/away/ships/pra/database_freighter/database_freighter_ghostroles.dm b/maps/away/ships/pra/database_freighter/database_freighter_ghostroles.dm index e0ed7d3dd1a..15ea5ca182f 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter_ghostroles.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter_ghostroles.dm @@ -24,7 +24,7 @@ shoes = /obj/item/clothing/shoes/jackboots/tajara uniform = /obj/item/clothing/under/tajaran/database_freighter - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship back = /obj/item/storage/backpack/duffel/eng accessory = /obj/item/clothing/accessory/badge/hadii_card diff --git a/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm b/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm index d33410bdfd7..e4879a52e72 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm +++ b/maps/away/ships/pra/headmaster/headmaster_ghostroles.dm @@ -22,7 +22,7 @@ name = "Kosmostrelki" id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship shoes = /obj/item/clothing/shoes/jackboots/tajara uniform = /obj/item/clothing/under/tajaran/cosmonaut accessory = /obj/item/clothing/accessory/badge/pra_passport diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index e64a8351873..8f44c774a60 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -252,7 +252,7 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_y = -28; gps_prefix = "KOSMO"; gpstag = "HEADMASTER"; @@ -1366,7 +1366,7 @@ /obj/item/clothing/head/hardhat, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/safety/goggles, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/item/storage/toolbox/mechanical, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full{ @@ -3377,7 +3377,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_y = 32; gps_prefix = "KOSMO"; gpstag = "KOSMOSHUTTLE"; @@ -3602,11 +3602,11 @@ pixel_x = -5; pixel_y = 4 }, -/obj/item/device/camera_film/taj_film{ +/obj/item/camera_film/taj_film{ pixel_x = 12; pixel_y = 6 }, -/obj/item/device/camera_film/taj_film{ +/obj/item/camera_film/taj_film{ pixel_x = 19; pixel_y = 4 }, @@ -5997,7 +5997,7 @@ /area/headmaster_ship/mess_hall) "xd" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 14; pixel_x = -7 }, @@ -6069,7 +6069,7 @@ dir = 10 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 12; pixel_x = -4 }, @@ -6101,11 +6101,11 @@ "xD" = ( /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = 1; pixel_y = 7 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 1; pixel_y = -2 }, @@ -6170,12 +6170,12 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/item/clothing/head/helmet/pilot, /obj/item/clothing/head/helmet/pilot, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, -/obj/item/device/binoculars{ +/obj/item/radio/hailing, +/obj/item/radio/hailing, +/obj/item/binoculars{ pixel_y = -3 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_y = 3 }, /obj/item/storage/toolbox/mechanical, @@ -6312,7 +6312,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/item/device/camera/adhomai{ +/obj/item/camera/adhomai{ pixel_y = 11; pixel_x = 2 }, @@ -6368,7 +6368,7 @@ dir = 4; pixel_x = 32 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 14; pixel_x = 7 }, @@ -6994,11 +6994,11 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/item/device/camera_film/taj_film{ +/obj/item/camera_film/taj_film{ pixel_x = -4; pixel_y = 2 }, -/obj/item/device/camera_film/taj_film{ +/obj/item/camera_film/taj_film{ pixel_x = 3 }, /turf/simulated/floor/tiled/dark{ @@ -7118,7 +7118,7 @@ /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, /obj/item/storage/box/fancy/med_pouch/radiation, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor{ temperature = 278.15 }, @@ -7471,7 +7471,7 @@ /area/headmaster_ship/infirmary) "DV" = ( /obj/structure/table/glass, -/obj/item/device/versebook/pra{ +/obj/item/versebook/pra{ pixel_x = -6; pixel_y = 2 }, @@ -7640,11 +7640,11 @@ pixel_x = 3; pixel_y = 8 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 1; pixel_x = -5 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 3; pixel_x = 6 }, @@ -7710,7 +7710,7 @@ }, /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 4 }, @@ -7912,11 +7912,11 @@ "FZ" = ( /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 7; pixel_y = 6 }, @@ -8387,7 +8387,7 @@ /area/shuttle/headmaster_shuttle) "HW" = ( /obj/structure/table/glass, -/obj/item/device/versebook/pra{ +/obj/item/versebook/pra{ pixel_x = 6; pixel_y = 2 }, @@ -8770,7 +8770,7 @@ dir = 5 }, /obj/structure/table/wood, -/obj/item/device/versebook/pra{ +/obj/item/versebook/pra{ pixel_y = 2 }, /turf/simulated/floor/wood{ @@ -8985,7 +8985,7 @@ pixel_x = 3; pixel_y = 9 }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/effect/floor_decal/industrial/outline/grey, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full{ @@ -9267,7 +9267,7 @@ /obj/item/storage/belt/medical, /obj/item/reagent_containers/hypospray, /obj/item/clothing/accessory/stethoscope, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/item/cane/crutch, /obj/item/cane/crutch, /obj/item/material/stool/chair/wheelchair, @@ -9966,7 +9966,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10121,7 +10121,7 @@ pixel_y = -32 }, /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/camera/adhomai{ +/obj/item/camera/adhomai{ pixel_y = 9; pixel_x = -2 }, @@ -10624,27 +10624,27 @@ /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "KOSMO"; gpstag = "KOSMO0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "KOSMO"; gpstag = "KOSMO0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "KOSMO"; gpstag = "KOSMO0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "KOSMO"; gpstag = "KOSMO0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "KOSMO"; gpstag = "KOSMO0" }, -/obj/item/device/gps{ +/obj/item/gps{ gps_prefix = "KOSMO"; gpstag = "KOSMO0" }, @@ -11517,11 +11517,11 @@ "Wd" = ( /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 7; pixel_y = 6 }, @@ -12244,7 +12244,7 @@ /obj/item/clothing/under/tajaran/cosmonaut/commissar, /obj/item/clothing/head/tajaran/cosmonaut_commissar, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/item/clothing/accessory/flagpatch/pra, /obj/machinery/light/floor{ dir = 1 diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm index 02ae70fe1fa..0e38cd1feb2 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dmm +++ b/maps/away/ships/sadar_scout/sadar_scout.dmm @@ -633,7 +633,7 @@ /obj/structure/table/rack, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/carpet/rubber, /area/ship/sadar_scout/solars) "eC" = ( @@ -5197,7 +5197,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor, -/obj/item/device/radio/intercom/hailing{ +/obj/item/radio/intercom/hailing{ pixel_x = -6; dir = 8 }, @@ -6196,14 +6196,14 @@ /obj/machinery/light/colored/decayed/dimmed{ dir = 8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 6 }, /turf/simulated/floor/carpet/rubber, @@ -6810,7 +6810,7 @@ name = "Bridge Blast Shield"; pixel_y = 8 }, -/obj/item/device/radio/intercom/hailing{ +/obj/item/radio/intercom/hailing{ dir = 1; pixel_y = -10 }, diff --git a/maps/away/ships/sadar_scout/sadar_scout_ghostroles.dm b/maps/away/ships/sadar_scout/sadar_scout_ghostroles.dm index 7dc20a00d11..4510ec71b7d 100644 --- a/maps/away/ships/sadar_scout/sadar_scout_ghostroles.dm +++ b/maps/away/ships/sadar_scout/sadar_scout_ghostroles.dm @@ -35,7 +35,7 @@ id = /obj/item/card/id/sadar_scout - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship accessory = /obj/item/clothing/accessory/offworlder/bracer/grey backpack_contents = list( diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 693732f911f..83da9dfca46 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -348,8 +348,8 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/tank/emergency_oxygen/engi{ @@ -370,7 +370,7 @@ /obj/random/spacecash, /obj/item/spacecash/c500, /obj/item/spacecash/c500, -/obj/item/device/flash, +/obj/item/flash, /obj/item/gun/projectile/revolver/detective, /obj/item/ammo_magazine/c38, /obj/item/ammo_magazine/c38/rubber, @@ -384,11 +384,11 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/encryptionkey/heads/captain{ +/obj/item/encryptionkey/heads/captain{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/encryptionkey/heads/captain{ +/obj/item/encryptionkey/heads/captain{ pixel_x = 5; pixel_y = -1 }, @@ -883,14 +883,14 @@ "eI" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight, /obj/machinery/power/apc/west{ req_access = null }, @@ -979,7 +979,7 @@ dir = 8 }, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 7; pixel_y = -9 }, @@ -1031,8 +1031,8 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, /obj/item/storage/box/lights/mixed, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /obj/random/powercell, /obj/random/tech_supply, /obj/random/tech_supply, @@ -1506,7 +1506,7 @@ }, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_x = 7; pixel_y = -7 }, @@ -1888,7 +1888,7 @@ /area/shuttle/scc_scout_ship_shuttle/medbay) "kH" = ( /obj/structure/table/wood, -/obj/item/device/paicard, +/obj/item/paicard, /obj/random/plushie, /turf/simulated/floor/carpet/darkblue, /area/ship/scc_scout_ship/mess) @@ -2386,28 +2386,28 @@ "nB" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 6; gpstag = "SCC12" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 8; gpstag = "SCC11" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = -6; gpstag = "SCC13" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = -8; gpstag = "SCC14" }, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/carpet/rubber, /area/shuttle/scc_scout_ship_shuttle/cargo) "nE" = ( @@ -2737,7 +2737,7 @@ pixel_y = 1; pixel_x = 3 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -4; pixel_y = 8 }, @@ -2993,7 +2993,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/scc_scout_ship_shuttle/propulsion_port) "qM" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -10; pixel_y = 4 }, @@ -3367,11 +3367,11 @@ "tt" = ( /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/flashlight, -/obj/item/device/radio, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/marshallingwand, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/radio, +/obj/item/flashlight/heavy, +/obj/item/flashlight/marshallingwand, +/obj/item/flashlight, /turf/simulated/floor/carpet/rubber, /area/shuttle/scc_scout_ship_shuttle/cargo) "tu" = ( @@ -3682,7 +3682,7 @@ dir = 9 }, /obj/item/folder/yellow, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/dark, /area/ship/scc_scout_ship/bridge) @@ -3992,7 +3992,7 @@ /area/ship/scc_scout_ship/maint_propulsion_port) "xs" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, /obj/effect/floor_decal/corner/brown{ dir = 6 @@ -6951,7 +6951,7 @@ pixel_x = -7; pixel_y = 2 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 6; gpstag = "SCC10" @@ -7311,11 +7311,11 @@ /turf/simulated/floor/marble, /area/ship/scc_scout_ship/mess) "UZ" = ( -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3; pixel_y = 7 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -3 }, /obj/effect/floor_decal/spline/plain/black{ @@ -7754,7 +7754,7 @@ /area/ship/scc_scout_ship/engineering_cargo) "WU" = ( /obj/structure/table/wood, -/obj/item/device/versebook/biesel{ +/obj/item/versebook/biesel{ pixel_x = -4; pixel_y = 4 }, @@ -7779,11 +7779,11 @@ "Xa" = ( /obj/item/storage/belt/archaeology, /obj/item/storage/box/unique/excavation, -/obj/item/device/flashlight/lantern, -/obj/item/device/ano_scanner, -/obj/item/device/depth_scanner, -/obj/item/device/core_sampler, -/obj/item/device/measuring_tape, +/obj/item/flashlight/lantern, +/obj/item/ano_scanner, +/obj/item/depth_scanner, +/obj/item/core_sampler, +/obj/item/measuring_tape, /obj/item/pickaxe/hand, /obj/item/storage/bag/fossils, /obj/item/stack/flag/green, @@ -7855,7 +7855,7 @@ pixel_y = 9; pixel_x = -5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 7; pixel_y = 2; gps_prefix = "SCC"; @@ -8243,7 +8243,7 @@ /turf/simulated/floor/marble, /area/ship/scc_scout_ship/mess) "ZJ" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/carbondioxide{ pixel_x = -6 }, diff --git a/maps/away/ships/scc/scc_scout_ship_ghostroles.dm b/maps/away/ships/scc/scc_scout_ship_ghostroles.dm index 580b139ce8b..42d27d032a4 100644 --- a/maps/away/ships/scc/scc_scout_ship_ghostroles.dm +++ b/maps/away/ships/scc/scc_scout_ship_ghostroles.dm @@ -168,7 +168,7 @@ id = /obj/item/card/id/orion_ship uniform = list(/obj/item/clothing/under/color/black, /obj/item/clothing/under/color/grey, /obj/item/clothing/under/color/white) shoes = /obj/item/clothing/shoes/jackboots - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/sol/sol_frigate/sol_frigate.dmm b/maps/away/ships/sol/sol_frigate/sol_frigate.dmm index 90d3a71239a..1c54da51519 100644 --- a/maps/away/ships/sol/sol_frigate/sol_frigate.dmm +++ b/maps/away/ships/sol/sol_frigate/sol_frigate.dmm @@ -1194,7 +1194,7 @@ /obj/structure/bed/stool/chair/padded/green{ dir = 4 }, -/obj/item/device/synthesized_instrument/violin, +/obj/item/synthesized_instrument/violin, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/bunks) "fj" = ( @@ -1421,7 +1421,7 @@ /area/ship/sol_frigate/Port_docking_port) "gj" = ( /obj/structure/closet/crate/elec, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/storage/toolbox/electrical, /obj/item/circuitboard/smes, /obj/item/circuitboard/smes, @@ -1773,7 +1773,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/armoury) "hJ" = ( -/obj/item/device/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/guitar, /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/bed/stool/chair/padded/green, /turf/simulated/floor/tiled/dark, @@ -1924,7 +1924,7 @@ /area/space) "iA" = ( /obj/structure/table/reinforced, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -2831,7 +2831,7 @@ /obj/item/storage/firstaid/radiation, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, -/obj/item/device/geiger, +/obj/item/geiger, /obj/effect/floor_decal/corner/brown{ dir = 9 }, @@ -3055,7 +3055,7 @@ /area/ship/sol_frigate/cic) "nF" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /obj/item/clothing/glasses/welding{ pixel_y = 12; pixel_x = 7 @@ -5750,12 +5750,12 @@ /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/eva_storage) "AJ" = ( @@ -6481,7 +6481,7 @@ pixel_y = -3; pixel_x = -8 }, -/obj/item/device/synthesized_instrument/violin, +/obj/item/synthesized_instrument/violin, /turf/simulated/floor/carpet, /area/ship/sol_frigate/captain_cabin) "DT" = ( @@ -6550,10 +6550,10 @@ /obj/item/grenade/chem_grenade/metalfoam, /obj/item/stack/rods/full, /obj/item/stack/material/glass/full, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/item/storage/bag/inflatable, /obj/effect/floor_decal/corner/orange{ dir = 9 @@ -6845,7 +6845,7 @@ /obj/item/storage/firstaid/radiation, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, -/obj/item/device/geiger, +/obj/item/geiger, /obj/effect/floor_decal/corner/brown{ dir = 5 }, @@ -7452,10 +7452,10 @@ /area/ship/sol_frigate/hangar) "Iu" = ( /obj/structure/table/reinforced, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -9 }, -/obj/item/device/radio, +/obj/item/radio, /obj/item/clipboard{ pixel_x = 6 }, @@ -8240,7 +8240,7 @@ pixel_y = 12; pixel_x = -8 }, -/obj/item/device/advanced_healthanalyzer, +/obj/item/advanced_healthanalyzer, /turf/simulated/floor/tiled/white, /area/ship/sol_frigate/sickbay) "Ls" = ( @@ -9041,7 +9041,7 @@ /obj/effect/floor_decal/corner/orange/full{ dir = 8 }, -/obj/item/device/radio/intercom/hailing/west, +/obj/item/radio/intercom/hailing/west, /obj/machinery/light{ dir = 1 }, @@ -9702,7 +9702,7 @@ /area/ship/sol_frigate/oquarters) "SV" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 9 }, /turf/simulated/floor/carpet, diff --git a/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm b/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm index d7467417509..9445991632d 100644 --- a/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm +++ b/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm @@ -61,7 +61,7 @@ id = /obj/item/card/id/ssrm_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship /obj/outfit/admin/ssrm_navy_chief_petty_officer/solfrig_xo/get_id_access() return list(ACCESS_SOL_SHIPS, ACCESS_EXTERNAL_AIRLOCKS) diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm index ac9f47b9ed2..2444b949f63 100644 --- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm +++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm @@ -1281,12 +1281,12 @@ "efK" = ( /obj/item/clothing/accessory/storage/webbingharness, /obj/item/clothing/head/helmet/pilot, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet, /turf/simulated/floor/tiled/dark, @@ -1512,8 +1512,8 @@ /area/ship/fsf_patrol_ship/grauwolf) "far" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark, @@ -2159,16 +2159,16 @@ icon_state = "tube_empty" }, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/gps, +/obj/item/gps, /obj/item/clothing/mask/gas/half, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/gps, +/obj/item/gps, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, @@ -2400,7 +2400,7 @@ /area/ship/fsf_patrol_ship/grauwolf) "ilo" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -6044,7 +6044,7 @@ /area/ship/fsf_patrol_ship/cic) "wFB" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/blue{ +/obj/item/flashlight/lamp/lava/blue{ pixel_x = 5; pixel_y = 3 }, diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship_ghostroles.dm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship_ghostroles.dm index c21338b3bec..b214c80ef87 100644 --- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship_ghostroles.dm +++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship_ghostroles.dm @@ -30,7 +30,7 @@ id = /obj/item/card/id/fsf_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) @@ -68,7 +68,7 @@ id = /obj/item/card/id/fsf_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm index 1d41b23fe64..8e0608db14d 100644 --- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm +++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm @@ -182,10 +182,10 @@ /area/ship/sfa_patrol_ship) "auY" = ( /obj/structure/table/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 10; pixel_x = -3 }, @@ -1135,16 +1135,16 @@ /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/half, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, @@ -1738,7 +1738,7 @@ /area/ship/sfa_patrol_ship/Engineering) "faR" = ( /obj/structure/table/rack, -/obj/item/device/assembly/infra, +/obj/item/assembly/infra, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -4214,11 +4214,11 @@ "mnb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/device/pipe_painter{ +/obj/item/pipe_painter{ pixel_x = 3; pixel_y = 2 }, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_x = -2; pixel_y = -3 }, @@ -4578,7 +4578,7 @@ /area/ship/sfa_patrol_ship/custodialammo) "nny" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, @@ -6323,7 +6323,7 @@ dir = 8; icon_state = "tube_empty" }, -/obj/item/device/versebook/tribunal{ +/obj/item/versebook/tribunal{ pixel_x = 6; pixel_y = 3 }, diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship_ghostroles.dm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship_ghostroles.dm index 6428a442116..24cf16983fd 100644 --- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship_ghostroles.dm +++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship_ghostroles.dm @@ -30,7 +30,7 @@ id = /obj/item/card/id/sfa_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) @@ -68,7 +68,7 @@ id = /obj/item/card/id/sfa_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) diff --git a/maps/away/ships/sol/sol_splf/splf_raider.dmm b/maps/away/ships/sol/sol_splf/splf_raider.dmm index 27f215ea616..c49796029a7 100644 --- a/maps/away/ships/sol/sol_splf/splf_raider.dmm +++ b/maps/away/ships/sol/sol_splf/splf_raider.dmm @@ -1989,7 +1989,7 @@ /area/splf_raider/closet) "lz" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_y = 3 }, /turf/simulated/floor/tiled/dark/full, @@ -2282,7 +2282,7 @@ /obj/item/clothing/accessory/armband/medgreen, /obj/item/storage/belt/medical/paramedic, /obj/item/reagent_containers/hypospray, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/item/reagent_containers/glass/bottle/polysomnine, /obj/item/storage/box/syringes, /obj/item/material/stool/chair/wheelchair, @@ -2535,7 +2535,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/dirt_75, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/item/storage/box/lights/mixed, /turf/simulated/floor/tiled/dark/full, /area/splf_raider/closet) @@ -3372,7 +3372,7 @@ pixel_y = -2; pixel_x = 4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 8; pixel_x = 7 }, @@ -3738,7 +3738,7 @@ /obj/item/spacecash/c1000, /obj/item/reagent_containers/food/drinks/flask, /obj/item/storage/secure/briefcase, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/item/flame/lighter/zippo/sol, /turf/simulated/floor/tiled/dark/full, /area/splf_raider/office) @@ -4204,7 +4204,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 4 }, /obj/random/dirt_75, @@ -4254,11 +4254,11 @@ "yO" = ( /obj/structure/table/reinforced/steel, /obj/random/dirt_75, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = 8; pixel_y = 7 }, @@ -4314,7 +4314,7 @@ /obj/machinery/computer/shuttle_control/explore/terminal/splf_shuttle{ dir = 4 }, -/obj/item/device/radio/intercom/expedition/hailing/west, +/obj/item/radio/intercom/expedition/hailing/west, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full, /area/shuttle/splf) @@ -5184,11 +5184,11 @@ /obj/machinery/light/colored/decayed{ dir = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 1; pixel_y = -2 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = 1; pixel_y = 7 }, @@ -5608,7 +5608,7 @@ icon_state = "0-8" }, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/table/rack, /obj/item/gun/energy/plasmacutter, /obj/random/dirt_75, @@ -6128,10 +6128,10 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, /obj/item/stack/material/phoron{ amount = 6 }, @@ -6623,12 +6623,12 @@ /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/random/dirt_75, /turf/simulated/floor/tiled/dark/full, /area/splf_raider/ready) @@ -6767,7 +6767,7 @@ dir = 4 }, /obj/item/storage/toolbox/mechanical, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3; pixel_y = 15 }, @@ -7390,7 +7390,7 @@ "QK" = ( /obj/machinery/alarm/south, /obj/structure/table/wood, -/obj/item/device/synthesized_instrument/guitar{ +/obj/item/synthesized_instrument/guitar{ pixel_y = 6; pixel_x = -2 }, diff --git a/maps/away/ships/sol/sol_splf/splf_raider_ghostroles.dm b/maps/away/ships/sol/sol_splf/splf_raider_ghostroles.dm index 01d6c0d43f4..8cd969e5a35 100644 --- a/maps/away/ships/sol/sol_splf/splf_raider_ghostroles.dm +++ b/maps/away/ships/sol/sol_splf/splf_raider_ghostroles.dm @@ -25,7 +25,7 @@ head = /obj/item/clothing/head/sol id = /obj/item/card/id/white accessory = /obj/item/clothing/accessory/holster/hip - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) /obj/outfit/admin/splf_crewman/get_id_access() @@ -79,7 +79,7 @@ belt = /obj/item/storage/belt/utility/full id = /obj/item/card/id/white accessory = /obj/item/clothing/accessory/storage/pouches/brown - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm b/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm index f24b66a1446..4edc8eb0d52 100644 --- a/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm +++ b/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm @@ -1379,11 +1379,11 @@ pixel_x = 3; pixel_y = 8 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 1; pixel_x = -5 }, -/obj/item/device/spaceflare{ +/obj/item/spaceflare{ pixel_y = 3; pixel_x = 6 }, @@ -2291,12 +2291,12 @@ /obj/effect/floor_decal/industrial/outline/grey, /obj/item/clothing/head/helmet/pilot, /obj/item/clothing/head/helmet/pilot, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, -/obj/item/device/binoculars{ +/obj/item/radio/hailing, +/obj/item/radio/hailing, +/obj/item/binoculars{ pixel_y = -3 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_y = 3 }, /obj/item/storage/toolbox/mechanical, @@ -3308,7 +3308,7 @@ }, /obj/item/storage/toolbox/mechanical, /obj/item/hoist_kit, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/ship/ssrm_corvette/starboard_battery) "gGU" = ( @@ -3584,7 +3584,7 @@ }, /obj/structure/table/rack, /obj/item/gun/energy/plasmacutter, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/ship/ssrm_corvette/synthroom) "hwL" = ( @@ -3960,7 +3960,7 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/rack, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5 }, /obj/item/clothing/suit/storage/hazardvest/red, @@ -4151,11 +4151,11 @@ pixel_x = 3; pixel_y = 2 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -12; pixel_y = 3 }, -/obj/item/device/radio/hailing{ +/obj/item/radio/hailing{ pixel_x = -12; pixel_y = 3 }, @@ -4513,11 +4513,11 @@ }, /obj/structure/cable, /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 1; pixel_y = -2 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = 1; pixel_y = 7 }, @@ -5159,7 +5159,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_x = -8 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 5; pixel_x = 3 }, @@ -5184,7 +5184,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_y = 32; gps_prefix = "SSRM"; gpstag = "SAMV"; @@ -6071,12 +6071,12 @@ /obj/item/clothing/accessory/flagpatch/sol, /obj/item/clothing/accessory/flagpatch/sol, /obj/item/clothing/accessory/flagpatch/sol, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/ssrm_corvette/eva_preperation) "ngs" = ( @@ -6504,7 +6504,7 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/rack, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5 }, /obj/item/clothing/suit/storage/hazardvest/red, @@ -7835,18 +7835,18 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/item/stack/material/phoron{ amount = 6 }, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /obj/item/material/stool/chair/wheelchair, /obj/item/material/stool/chair/wheelchair, /obj/item/cane/crutch, @@ -7862,7 +7862,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/ship/ssrm_corvette/infirmary) "rGD" = ( @@ -8100,7 +8100,7 @@ /obj/effect/floor_decal/industrial/outline_corner/service{ dir = 1 }, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/item/clothing/accessory/holster/thigh, /obj/item/storage/belt/military, /obj/item/clothing/accessory/storage/pouches/black, @@ -8866,7 +8866,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_y = 4; pixel_x = 4 }, @@ -8874,7 +8874,7 @@ pixel_x = 3; pixel_y = 12 }, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /turf/simulated/floor/tiled/dark, /area/ship/ssrm_corvette/garage) "uyh" = ( @@ -9572,7 +9572,7 @@ }, /obj/item/storage/toolbox/mechanical, /obj/item/hoist_kit, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled/dark, /area/ship/ssrm_corvette/port_battery) "waK" = ( @@ -10096,10 +10096,10 @@ req_access = list(203) }, /obj/item/storage/belt/security/full{ - starts_with = list(/obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, /obj/item/device/flash = 1) + starts_with = list(/obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, /obj/item/flash = 1) }, /obj/item/storage/belt/security/full{ - starts_with = list(/obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, /obj/item/device/flash = 1) + starts_with = list(/obj/item/reagent_containers/spray/pepper = 1, /obj/item/handcuffs = 2, /obj/item/flash = 1) }, /obj/item/gun/energy/taser, /obj/item/gun/energy/taser, diff --git a/maps/away/ships/sol/sol_ssrm/ssrm_ship_ghostroles.dm b/maps/away/ships/sol/sol_ssrm/ssrm_ship_ghostroles.dm index 764edfbd810..24c115ed305 100644 --- a/maps/away/ships/sol/sol_ssrm/ssrm_ship_ghostroles.dm +++ b/maps/away/ships/sol/sol_ssrm/ssrm_ship_ghostroles.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/ssrm_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) @@ -64,7 +64,7 @@ id = /obj/item/card/id/ssrm_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) @@ -125,7 +125,7 @@ id = /obj/item/card/id/ssrm_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) @@ -161,7 +161,7 @@ id = /obj/item/card/id/ssrm_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/melee/energy/sword/knife/sol = 1) diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm index 23d44e6ad42..adbe49887e8 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dmm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm @@ -280,7 +280,7 @@ /turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "bpn" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/marble{ temperature = 278.15 }, @@ -548,7 +548,7 @@ /area/adhomian_circus/port) "cFk" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -773,7 +773,7 @@ /area/adhomian_circus/crew) "dIJ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1387,7 +1387,7 @@ /area/adhomian_circus/maintenance) "gTj" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -2148,7 +2148,7 @@ }, /area/adhomian_circus/crew) "lmZ" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/wood, /turf/simulated/floor/wood{ temperature = 278.15 @@ -2429,7 +2429,7 @@ /area/adhomian_circus/port) "mpc" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/pink/full, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -3604,7 +3604,7 @@ }, /area/adhomian_circus/clown) "sMW" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/marble{ temperature = 278.15 }, @@ -4393,7 +4393,7 @@ /area/adhomian_circus/starboard) "xCk" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/cyan, +/obj/item/flashlight/lamp/lava/cyan, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -4457,7 +4457,7 @@ }, /obj/structure/closet/crate/internals, /obj/item/storage/bag/inflatable, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/tank/emergency_oxygen{ pixel_x = 5 }, diff --git a/maps/away/ships/tajara/circus/adhomian_circus_roles.dm b/maps/away/ships/tajara/circus/adhomian_circus_roles.dm index 0c4d1bf74ff..f215109faf1 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus_roles.dm +++ b/maps/away/ships/tajara/circus/adhomian_circus_roles.dm @@ -3,7 +3,7 @@ /obj/outfit/admin/adhomian_circus id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship r_pocket = /obj/item/storage/wallet/random /obj/outfit/admin/adhomian_circus/get_id_access() diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index ba82fd62383..28de81601b6 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -488,7 +488,7 @@ /area/tajaran_smuggler/engine) "bOZ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, @@ -1358,7 +1358,7 @@ /area/shuttle/tajaran_smuggler) "gzB" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -1563,7 +1563,7 @@ }, /obj/structure/closet/crate/internals, /obj/item/storage/bag/inflatable, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/tank/emergency_oxygen{ pixel_x = 5 }, @@ -1645,7 +1645,7 @@ /area/tajaran_smuggler) "hPd" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/random/coin, /obj/machinery/alarm/cold/east{ req_one_access = null @@ -2746,7 +2746,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/engineering, /obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /obj/machinery/light/small{ dir = 1; pixel_y = 5 @@ -3248,7 +3248,7 @@ pixel_y = 32 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor{ temperature = 278.15 }, @@ -3336,7 +3336,7 @@ /area/shuttle/tajaran_smuggler_cargo) "qHm" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -4270,7 +4270,7 @@ /obj/machinery/alarm/cold/north{ req_one_access = null }, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor{ temperature = 278.15 }, diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm index a1d5bf95b19..8c7995054b4 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_ghostroles.dm @@ -56,7 +56,7 @@ id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1) species_shoes = list( diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm index 7bf2ea62d44..e9b5c5dfa52 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm @@ -858,7 +858,7 @@ dir = 5 }, /obj/structure/table/skrell, -/obj/item/device/price_scanner{ +/obj/item/price_scanner{ pixel_x = 4 }, /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha{ @@ -1504,7 +1504,7 @@ dir = 4 }, /obj/structure/table/skrell, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 5 }, /obj/effect/floor_decal/spline/plain/black{ @@ -1651,7 +1651,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/obj/item/device/radio/intercom/hailing{ +/obj/item/radio/intercom/hailing{ dir = 1; pixel_y = 22; pixel_x = -6 @@ -1866,11 +1866,11 @@ dir = 8 }, /obj/structure/table/skrell, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10; pixel_x = -5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = 4 }, /obj/effect/floor_decal/spline/plain/black{ @@ -2145,7 +2145,7 @@ /obj/item/paper_scanner{ pixel_x = -16 }, -/obj/item/device/cratescanner{ +/obj/item/cratescanner{ pixel_x = -8; pixel_y = 3 }, @@ -2500,7 +2500,7 @@ /obj/item/clothing/accessory/badge/passport/nralakk{ pixel_x = 4 }, -/obj/item/device/flashlight/lamp/lava/cyan{ +/obj/item/flashlight/lamp/lava/cyan{ pixel_x = -8 }, /obj/machinery/power/apc/super/south{ @@ -3920,7 +3920,7 @@ pixel_x = 8; pixel_y = 7 }, -/obj/item/device/radio/intercom/hailing{ +/obj/item/radio/intercom/hailing{ dir = 1; pixel_y = -10; pixel_x = 4 @@ -4094,7 +4094,7 @@ pixel_y = 4; pixel_x = -4 }, -/obj/item/device/flashlight/lamp/lava/purple{ +/obj/item/flashlight/lamp/lava/purple{ pixel_x = 6 }, /turf/simulated/floor/shuttle/skrell, @@ -4983,7 +4983,7 @@ /obj/structure/window/borosilicate/reinforced/skrell{ dir = 8 }, -/obj/item/device/flashlight/lamp/lava/purple{ +/obj/item/flashlight/lamp/lava/purple{ pixel_x = -6; pixel_y = 6 }, @@ -5188,34 +5188,34 @@ /area/shuttle/tirakqi_smuggler_shuttle) "Fo" = ( /obj/structure/table/skrell, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10; pixel_x = 5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -5 }, /obj/effect/floor_decal/spline/plain/black{ dir = 1 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -5 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -5 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10; pixel_x = 5 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10; pixel_x = 5 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 10; pixel_x = 5 }, @@ -6848,8 +6848,8 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /obj/effect/floor_decal/spline/plain/black{ @@ -7190,7 +7190,7 @@ /area/ship/tirakqi_smuggler/engi) "RO" = ( /obj/structure/table/skrell, -/obj/item/device/radio/intercom/hailing{ +/obj/item/radio/intercom/hailing{ dir = 1; pixel_y = -10 }, @@ -7987,7 +7987,7 @@ /obj/item/clothing/head/radiation, /obj/item/clothing/suit/radiation, /obj/item/clothing/glasses/safety/goggles, -/obj/item/device/geiger, +/obj/item/geiger, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/tirakqi_smuggler/engi) diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_ghostroles.dm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_ghostroles.dm index 8444473f3fb..ee6ac4556d8 100644 --- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_ghostroles.dm +++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler_ghostroles.dm @@ -65,7 +65,7 @@ id = /obj/item/card/id - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm index d9d16ea73fd..9fca3863a2c 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm @@ -291,7 +291,7 @@ /area/tramp_freighter/kitchen) "bC" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 5; pixel_x = -2 }, @@ -2819,7 +2819,7 @@ /obj/random/contraband, /obj/random/contraband, /obj/structure/closet/crate, -/obj/item/device/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/guitar, /obj/item/reagent_containers/food/drinks/bottle/pwine, /turf/simulated/floor/plating, /area/tramp_freighter/cargo) @@ -5163,7 +5163,7 @@ "zH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/machinery/light/small/emergency{ dir = 4 }, @@ -5292,7 +5292,7 @@ "Ao" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed, -/obj/item/device/flashlight, +/obj/item/flashlight, /turf/simulated/floor/plating, /area/tramp_freighter/cargo) "Ap" = ( @@ -5676,7 +5676,7 @@ "Cv" = ( /obj/structure/table/reinforced/steel, /obj/effect/decal/cleanable/dirt, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = -4; pixel_x = 7 }, @@ -5826,7 +5826,7 @@ /obj/item/spacecash/c1000, /obj/structure/closet/cabinet, /obj/item/clothing/suit/armor/material/makeshift/trenchcoat, -/obj/item/device/flash, +/obj/item/flash, /obj/item/storage/secure/briefcase, /obj/machinery/light_switch{ pixel_y = 30; @@ -6589,14 +6589,14 @@ /obj/random/bomb_supply, /obj/random/bomb_supply, /obj/random/bomb_supply, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/storage/bag/circuits/basic, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/circuitry, /obj/item/clothing/under/circuitry, /obj/item/clothing/glasses/circuitry, -/obj/item/device/paicard, +/obj/item/paicard, /obj/item/ipc_tag_scanner, /turf/simulated/floor/tiled/dark/full, /area/tramp_freighter/cargo) @@ -6903,7 +6903,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/device/geiger, +/obj/item/geiger, /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/tramp_freighter/power) @@ -7074,7 +7074,7 @@ /obj/structure/table/reinforced/steel, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/device/radio/intercom/expedition/hailing/east, +/obj/item/radio/intercom/expedition/hailing/east, /obj/item/paper_bin{ pixel_x = 4; pixel_y = 5 @@ -7276,7 +7276,7 @@ /area/tramp_freighter/starboard_docking) "LX" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -13; pixel_y = 2 }, @@ -7589,7 +7589,7 @@ /area/tramp_freighter/lounge) "Nx" = ( /obj/structure/table/steel, -/obj/item/device/radio/intercom/expedition/hailing/east, +/obj/item/radio/intercom/expedition/hailing/east, /obj/item/folder/yellow{ pixel_x = 3 }, @@ -7905,14 +7905,14 @@ "Ph" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/machinery/light{ dir = 4 }, @@ -8040,7 +8040,7 @@ dir = 10 }, /obj/machinery/meter, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_x = -13; pixel_y = -7 }, @@ -8212,7 +8212,7 @@ /area/shuttle/freighter_shuttle) "QI" = ( /obj/effect/floor_decal/industrial/hatch/grey, -/obj/item/device/radio/intercom/expedition/hailing/north, +/obj/item/radio/intercom/expedition/hailing/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/ship/engines/terminal, /turf/simulated/floor/carpet/rubber, @@ -9779,11 +9779,11 @@ /area/tramp_freighter/equipment) "Yp" = ( /obj/structure/table/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -7; pixel_y = 4 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 10; pixel_y = 3 }, diff --git a/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm b/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm index 78d4080b6c6..ecf77fe28b8 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm @@ -25,7 +25,7 @@ id = /obj/item/card/id/freighter_crew_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm index 5ef7957ab1f..8d00bafec2c 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm @@ -2292,7 +2292,7 @@ /area/hiskyn_ship/thrusts) "aSz" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /obj/item/clothing/ears/earmuffs, /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/blaster) @@ -2418,11 +2418,11 @@ /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/carpet/rubber, /area/hiskyn_ship/cargobay) "aVP" = ( @@ -2431,7 +2431,7 @@ dir = 1 }, /obj/item/clothing/ears/earmuffs, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/francisca) "aVW" = ( @@ -3811,7 +3811,7 @@ dir = 6 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 3; pixel_x = 6 }, @@ -4493,7 +4493,7 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor, -/obj/item/device/radio/intercom/hailing{ +/obj/item/radio/intercom/hailing{ pixel_x = -6; dir = 8 }, @@ -4879,7 +4879,7 @@ name = "Shuttle Equipment" }, /obj/item/storage/toolbox/mechanical, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /obj/item/storage/firstaid/light{ starts_with = list(/obj/item/clothing/gloves/latex/nitrile/unathi = 1, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/inaprovaline = 1, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/mortaphenyl = 1, /obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/dexalin = 1, /obj/item/stack/medical/bruise_pack = 1) }, @@ -5121,7 +5121,7 @@ /area/hiskyn_ship/bridge) "nhs" = ( /obj/structure/table/steel, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/effect/floor_decal/spline/plain/brown{ pixel_y = 29 }, @@ -5157,7 +5157,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/item/device/versebook/thakh{ +/obj/item/versebook/thakh{ pixel_y = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6265,7 +6265,7 @@ /obj/effect/floor_decal/corner/red{ dir = 1 }, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/tiled/dark, /area/hiskyn_ship/bridge) "sEq" = ( diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn_ghostroles.dm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn_ghostroles.dm index 1b74b6e64b2..f4e642b3772 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn_ghostroles.dm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn_ghostroles.dm @@ -41,7 +41,7 @@ id = /obj/item/card/id back = /obj/item/storage/backpack/satchel gloves = /obj/item/clothing/gloves/unathi - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list( /obj/item/storage/box/survival = 1 diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm index ae735f53ae3..ed4328edf53 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm @@ -322,7 +322,7 @@ icon_state = "2-4" }, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/stack/material/tritium/full, /obj/item/stack/material/tritium/full, /obj/structure/closet/walllocker{ @@ -1050,7 +1050,7 @@ /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /obj/effect/floor_decal/industrial/warning{ dir = 9 }, @@ -1764,7 +1764,7 @@ /area/shuttle/unathi_pirate_izharshan/dorms) "QF" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars/spyglass{ +/obj/item/binoculars/spyglass{ pixel_x = 7 }, /obj/effect/floor_decal/corner_wide/dark_green{ @@ -1775,7 +1775,7 @@ pixel_y = 8 }, /obj/item/blueprints/shuttle, -/obj/item/device/radio{ +/obj/item/radio{ name = "old radio"; icon_state = "radio"; desc = "An old, cheap radio that looks heavy enough to kill ssomeone."; @@ -1973,10 +1973,10 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm index 77cc7daa343..89b7cb14dcf 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm @@ -54,7 +54,7 @@ head = /obj/item/clothing/head/headbando/random - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list( /obj/item/storage/box/survival = 1 diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm index ea106b5047f..ea5a04c99ab 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm @@ -934,7 +934,7 @@ pixel_x = 7; pixel_y = -2 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 6 }, @@ -2623,7 +2623,7 @@ id = "tarwa_exosuit_containment" }, /obj/item/clothing/ears/earmuffs, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/plating, /area/tarwa_ship/oldhangar) "zy" = ( @@ -3043,11 +3043,11 @@ /area/tarwa_ship/cic) "De" = ( /obj/structure/table/rack, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, +/obj/item/gps, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, @@ -3846,7 +3846,7 @@ dir = 5 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 13; pixel_x = 5 }, @@ -3899,11 +3899,11 @@ "Kl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/tarwa_ship/bridge) @@ -4154,7 +4154,7 @@ dir = 4 }, /obj/structure/table/diona, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/diona, /area/tarwa_ship/bridge) "Mq" = ( @@ -4309,7 +4309,7 @@ req_one_access = list(210) }, /obj/item/clothing/ears/earmuffs, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/diona, /area/tarwa_ship/gun) "Nw" = ( @@ -4847,15 +4847,15 @@ /obj/structure/closet/crate{ name = "Emergency Lights" }, -/obj/item/device/uv_light, -/obj/item/device/uv_light, -/obj/item/device/uv_light, +/obj/item/uv_light, +/obj/item/uv_light, +/obj/item/uv_light, /obj/random/glowstick, /obj/random/glowstick, /obj/random/glowstick, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/plating, /area/tarwa_ship/oldhangar) "RK" = ( diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa_ghostroles.dm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa_ghostroles.dm index adcc14cc0d3..a48c18bc842 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa_ghostroles.dm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa_ghostroles.dm @@ -52,7 +52,7 @@ back = /obj/item/storage/backpack/satchel accessory = /obj/item/clothing/accessory/storage/webbing gloves = /obj/item/clothing/gloves/unathi - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list( /obj/item/storage/box/survival = 1 @@ -65,7 +65,7 @@ name = "Tarwa Conglomerate Diona" suit = /obj/item/clothing/accessory/poncho/green head = /obj/item/clothing/head/bandana/pirate - backpack_contents = list(/obj/item/device/uv_light = 1) + backpack_contents = list(/obj/item/uv_light = 1) /obj/outfit/admin/tarwa/captain name = "Tarwa Conglomerate Captain" diff --git a/maps/away/ships/wildlands_militia/militia_ship.dmm b/maps/away/ships/wildlands_militia/militia_ship.dmm index 6bce7911cd9..4eb7752371f 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dmm +++ b/maps/away/ships/wildlands_militia/militia_ship.dmm @@ -85,7 +85,7 @@ }, /obj/item/clothing/suit/space/void/freelancer, /obj/item/clothing/head/helmet/space/void/freelancer, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/militia_ship) "atj" = ( @@ -622,7 +622,7 @@ /area/ship/militia_ship) "hcf" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/rubber, /area/ship/militia_ship) "hdb" = ( @@ -663,7 +663,7 @@ /area/ship/militia_ship) "huE" = ( /obj/structure/table/steel, -/obj/item/device/radio{ +/obj/item/radio{ icon_state = "radio" }, /obj/item/toy/comic, @@ -695,7 +695,7 @@ }, /obj/item/clothing/suit/space/void/freelancer, /obj/item/clothing/head/helmet/space/void/freelancer, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/militia_ship) "hQA" = ( @@ -1371,7 +1371,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen/multi, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark, /area/ship/militia_ship) "uaE" = ( @@ -1427,7 +1427,7 @@ /obj/structure/table/rack, /obj/item/clothing/suit/space/void/freelancer, /obj/item/clothing/head/helmet/space/void/freelancer, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled/dark, /area/ship/militia_ship) "uYP" = ( @@ -1708,7 +1708,7 @@ /area/space) "ygr" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/device/flashlight/lamp/lava/blue{ +/obj/item/flashlight/lamp/lava/blue{ pixel_x = 2; pixel_y = 14 }, diff --git a/maps/away/ships/wildlands_militia/militia_ship_ghostroles.dm b/maps/away/ships/wildlands_militia/militia_ship_ghostroles.dm index 3bab1be1d5e..1fcafcfbb53 100644 --- a/maps/away/ships/wildlands_militia/militia_ship_ghostroles.dm +++ b/maps/away/ships/wildlands_militia/militia_ship_ghostroles.dm @@ -25,7 +25,7 @@ id = /obj/item/card/id/militia_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm index 5bbe2a1a9be..cbea706c9b7 100644 --- a/maps/away/ships/xanu/xanu_frigate.dmm +++ b/maps/away/ships/xanu/xanu_frigate.dmm @@ -1173,10 +1173,10 @@ /obj/item/grenade/chem_grenade/metalfoam, /obj/item/stack/rods/full, /obj/item/stack/material/glass/full, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor/tiled/dark/full, /area/ship/xanu_frigate/weapon/longbow) "eq" = ( @@ -1460,7 +1460,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = -8 }, /obj/structure/cable{ @@ -1831,10 +1831,10 @@ "gw" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/gunmetal, /area/ship/xanu_frigate/eva) "gz" = ( @@ -4397,14 +4397,14 @@ /obj/structure/closet/crate{ name = "vendor resupply crate" }, -/obj/item/device/vending_refill/frontiervend, -/obj/item/device/vending_refill/cola, -/obj/item/device/vending_refill/cutlery, -/obj/item/device/vending_refill/hydro, -/obj/item/device/vending_refill/meds, -/obj/item/device/vending_refill/snack, -/obj/item/device/vending_refill/zora, -/obj/item/device/vending_refill/tools, +/obj/item/vending_refill/frontiervend, +/obj/item/vending_refill/cola, +/obj/item/vending_refill/cutlery, +/obj/item/vending_refill/hydro, +/obj/item/vending_refill/meds, +/obj/item/vending_refill/snack, +/obj/item/vending_refill/zora, +/obj/item/vending_refill/tools, /obj/random/tech_supply, /obj/random/tech_supply, /obj/item/flame/lighter/random, @@ -4927,7 +4927,7 @@ /obj/structure/bed/handrail{ dir = 4 }, -/obj/item/device/radio/intercom/hailing/west, +/obj/item/radio/intercom/hailing/west, /turf/simulated/floor/tiled/dark, /area/shuttle/xanu_fighter) "qP" = ( @@ -4955,7 +4955,7 @@ dir = 5 }, /obj/structure/closet/crate/elec, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/storage/toolbox/electrical, /obj/item/circuitboard/smes, /obj/item/circuitboard/smes, @@ -5226,7 +5226,7 @@ name = "External Airlocks Lockdown"; req_access = list(222) }, -/obj/item/device/radio/intercom/hailing/west, +/obj/item/radio/intercom/hailing/west, /turf/simulated/floor/tiled/dark/full, /area/ship/xanu_frigate/bridge) "rP" = ( @@ -5911,7 +5911,7 @@ /obj/effect/floor_decal/corner/purple{ dir = 10 }, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /turf/simulated/floor/tiled/gunmetal, /area/ship/xanu_frigate/custodial) "up" = ( @@ -6792,7 +6792,7 @@ /area/shuttle/xanu_boarder/main) "xH" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 3; pixel_y = -6 }, @@ -6801,8 +6801,8 @@ "xK" = ( /obj/structure/table/reinforced/steel, /obj/machinery/light, -/obj/item/device/binoculars, -/obj/item/device/binoculars{ +/obj/item/binoculars, +/obj/item/binoculars{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark/full, @@ -7334,7 +7334,7 @@ /area/ship/xanu_frigate/cargo_bay) "zA" = ( /obj/structure/bed/stool/chair/sofa/right/black, -/obj/item/device/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/guitar, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, @@ -8076,8 +8076,8 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/weldingtool/hugetank, /obj/item/weldingtool/hugetank, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/ship/xanu_frigate/engineering/port) "Cu" = ( @@ -8321,7 +8321,7 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, -/obj/item/device/radio/intercom/hailing/east, +/obj/item/radio/intercom/hailing/east, /turf/simulated/floor/tiled/dark, /area/ship/xanu_frigate/cic) "Dc" = ( @@ -8896,8 +8896,8 @@ /obj/item/clothing/mask/gas/alt, /obj/item/clothing/mask/gas/alt, /obj/item/clothing/mask/gas/alt, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, /turf/simulated/floor/tiled/dark, /area/ship/xanu_frigate/cic) "EY" = ( @@ -9456,8 +9456,8 @@ }, /obj/item/stack/material/steel/full, /obj/item/stack/rods/full, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, +/obj/item/oxycandle, +/obj/item/oxycandle, /obj/item/storage/bag/inflatable, /turf/simulated/floor/plating, /area/shuttle/xanu_fighter) @@ -9475,7 +9475,7 @@ pixel_x = 8; pixel_y = 11 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 3; pixel_y = -6 }, @@ -10492,7 +10492,7 @@ name = "Privacy Shutters" }, /obj/structure/table/steel, -/obj/item/device/mass_spectrometer, +/obj/item/mass_spectrometer, /turf/simulated/floor/tiled/white, /area/ship/xanu_frigate/medbay) "Kc" = ( @@ -10650,10 +10650,10 @@ /obj/item/grenade/chem_grenade/metalfoam, /obj/item/stack/rods/full, /obj/item/stack/material/glass/full, -/obj/item/device/oxycandle, -/obj/item/device/oxycandle, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/oxycandle, +/obj/item/oxycandle, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/item/storage/bag/inflatable, /turf/simulated/floor/tiled/gunmetal, /area/shuttle/xanu_boarder/main) @@ -10752,7 +10752,7 @@ "KH" = ( /obj/structure/table/reinforced/steel, /obj/structure/railing/mapped, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 3; pixel_y = 11 }, @@ -11245,7 +11245,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, -/obj/item/device/radio/intercom/hailing/north, +/obj/item/radio/intercom/hailing/north, /turf/simulated/floor/tiled/dark, /area/ship/xanu_frigate/cic) "Mz" = ( @@ -13019,7 +13019,7 @@ /area/shuttle/xanu_fighter) "Sz" = ( /obj/machinery/computer/ship/engines/terminal, -/obj/item/device/radio/intercom/hailing/north, +/obj/item/radio/intercom/hailing/north, /turf/simulated/floor/tiled/dark/full, /area/shuttle/xanu_boarder/cockpit) "SC" = ( @@ -13731,11 +13731,11 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 8 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = 3; pixel_x = 3 }, -/obj/item/device/t_scanner{ +/obj/item/t_scanner{ pixel_y = 4; pixel_x = -5 }, @@ -13843,7 +13843,7 @@ /area/ship/xanu_frigate/disposals) "Vs" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -5; pixel_y = 10 }, @@ -14198,10 +14198,10 @@ dir = 8 }, /obj/structure/table/rack, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_y = 3 }, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_y = -2 }, /obj/machinery/power/apc/super/critical/south, @@ -14805,7 +14805,7 @@ }, /obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/welding, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/plating, /area/shuttle/xanu_boarder/engineering) "Yy" = ( @@ -14936,13 +14936,13 @@ /obj/item/rfd/piping{ pixel_y = 6 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = -1 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = -1 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = -1 }, /turf/simulated/floor/plating, diff --git a/maps/away/ships/xanu/xanu_frigate_ghostroles.dm b/maps/away/ships/xanu/xanu_frigate_ghostroles.dm index d6275c9af96..dbb1a1ba3c0 100644 --- a/maps/away/ships/xanu/xanu_frigate_ghostroles.dm +++ b/maps/away/ships/xanu/xanu_frigate_ghostroles.dm @@ -47,10 +47,10 @@ uniform = /obj/item/clothing/under/xanu head = /obj/item/clothing/head/xanu shoes = /obj/item/clothing/shoes/jackboots - l_ear = /obj/item/device/radio/headset/ship/coalition_navy + l_ear = /obj/item/radio/headset/ship/coalition_navy back = /obj/item/storage/backpack/satchel id = /obj/item/card/id/coalition - l_pocket = /obj/item/device/radio/off + l_pocket = /obj/item/radio/off backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, /obj/item/clothing/mask/gas/half = 1, diff --git a/maps/away/ships/yacht/yacht.dmm b/maps/away/ships/yacht/yacht.dmm index ce1fb60d5a8..113f2ef4180 100644 --- a/maps/away/ships/yacht/yacht.dmm +++ b/maps/away/ships/yacht/yacht.dmm @@ -492,7 +492,7 @@ }, /obj/item/storage/bible, /obj/item/pen/blue, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/structure/table/wood, /turf/simulated/floor/carpet/purple, /area/shuttle/yacht/living) diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index d6da447d033..962055f112a 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -247,7 +247,7 @@ }, /obj/structure/closet/crate/internals, /obj/item/storage/bag/inflatable, -/obj/item/device/oxycandle, +/obj/item/oxycandle, /obj/item/tank/emergency_oxygen{ pixel_x = 5 }, @@ -5035,7 +5035,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 14 }, @@ -5335,7 +5335,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_y = 4; pixel_x = -4 }, @@ -5933,9 +5933,9 @@ dir = 5 }, /obj/item/storage/toolbox/emergency, -/obj/item/device/flashlight, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare/glowstick/random, +/obj/item/flashlight, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare/glowstick/random, /obj/random/tool, /obj/item/tank/emergency_oxygen{ pixel_x = 5 diff --git a/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm b/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm index 6d0943a41a6..26c1633f25f 100644 --- a/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm +++ b/maps/away/ships/yacht_civ/yacht_civ_ghostroles.dm @@ -26,5 +26,5 @@ uniform = list(/obj/item/clothing/under/pj/red, /obj/item/clothing/under/pj/blue) wrist = list(/obj/item/clothing/wrists/watch/silver, /obj/item/clothing/wrists/watch/gold) - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship l_pocket = /obj/item/storage/wallet/rich diff --git a/maps/dungeon_spawns/carp_nest01.dmm b/maps/dungeon_spawns/carp_nest01.dmm index 8caf0d9042f..4966cb87c7b 100644 --- a/maps/dungeon_spawns/carp_nest01.dmm +++ b/maps/dungeon_spawns/carp_nest01.dmm @@ -33,7 +33,7 @@ /turf/simulated/floor/exoplanet/asteroid/ash/rocky, /area/mine/unexplored) "j" = ( -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ on = 1 }, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, diff --git a/maps/dungeon_spawns/carp_nest06.dmm b/maps/dungeon_spawns/carp_nest06.dmm index 2de41c3df47..777c350d530 100644 --- a/maps/dungeon_spawns/carp_nest06.dmm +++ b/maps/dungeon_spawns/carp_nest06.dmm @@ -30,7 +30,7 @@ /turf/simulated/floor/exoplanet/asteroid/ash/rocky, /area/mine/unexplored) "i" = ( -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor/exoplanet/asteroid/ash/rocky, /area/mine/unexplored) "j" = ( diff --git a/maps/dungeon_spawns/coc_ship_unique.dmm b/maps/dungeon_spawns/coc_ship_unique.dmm index ccd1f25db4c..5ec346c9ce7 100644 --- a/maps/dungeon_spawns/coc_ship_unique.dmm +++ b/maps/dungeon_spawns/coc_ship_unique.dmm @@ -1218,7 +1218,7 @@ /area/dungeon/crashed_ship) "yw" = ( /obj/effect/decal/cleanable/liquid_fuel, -/obj/item/device/suit_cooling_unit/no_cell, +/obj/item/suit_cooling_unit/no_cell, /turf/simulated/floor/plating, /area/dungeon/crashed_ship) "yy" = ( @@ -1437,7 +1437,7 @@ }, /obj/item/stack/cable_coil/random, /obj/item/cell, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -6; pixel_y = 14 }, @@ -1742,7 +1742,7 @@ /area/dungeon/crashed_ship) "Mx" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/dark{ nitrogen = 0; diff --git a/maps/dungeon_spawns/crashed_pod_unique.dmm b/maps/dungeon_spawns/crashed_pod_unique.dmm index b855d11ff17..9121a099fb7 100644 --- a/maps/dungeon_spawns/crashed_pod_unique.dmm +++ b/maps/dungeon_spawns/crashed_pod_unique.dmm @@ -122,7 +122,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/mine/unexplored) "C" = ( -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/shuttle/dark_blue, /area/mine/unexplored) "D" = ( diff --git a/maps/dungeon_spawns/escape_pod_unique.dmm b/maps/dungeon_spawns/escape_pod_unique.dmm index 0805b0e9967..172fa31d684 100644 --- a/maps/dungeon_spawns/escape_pod_unique.dmm +++ b/maps/dungeon_spawns/escape_pod_unique.dmm @@ -29,7 +29,7 @@ /obj/random/voidsuit, /obj/random/energy_antag, /obj/random/smalltank, -/obj/item/device/gps, +/obj/item/gps, /obj/item/archaeological_find, /turf/simulated/floor/shuttle/dark_blue, /area/mine/unexplored) diff --git a/maps/dungeon_spawns/satellite_crash_unique.dmm b/maps/dungeon_spawns/satellite_crash_unique.dmm index de3877bb930..3e1670659bb 100644 --- a/maps/dungeon_spawns/satellite_crash_unique.dmm +++ b/maps/dungeon_spawns/satellite_crash_unique.dmm @@ -35,7 +35,7 @@ "i" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/structure/computerframe, -/obj/item/device/gps, +/obj/item/gps, /obj/item/material/shard, /turf/simulated/floor/airless, /area/dungeon/crashed_satellite) diff --git a/maps/dungeon_spawns/shuttle_unique.dmm b/maps/dungeon_spawns/shuttle_unique.dmm index 91314139992..0c886828b20 100644 --- a/maps/dungeon_spawns/shuttle_unique.dmm +++ b/maps/dungeon_spawns/shuttle_unique.dmm @@ -59,7 +59,7 @@ pixel_y = 2 }, /obj/structure/table/reinforced, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark, /area/dungeon/crashed_ship) "ak" = ( diff --git a/maps/dungeon_spawns/skrell_crash_unique.dmm b/maps/dungeon_spawns/skrell_crash_unique.dmm index 6b54f6347ec..749caf9388d 100644 --- a/maps/dungeon_spawns/skrell_crash_unique.dmm +++ b/maps/dungeon_spawns/skrell_crash_unique.dmm @@ -168,7 +168,7 @@ /turf/simulated/floor/shuttle/skrell/blue, /area/dungeon/skrell_ship) "aE" = ( -/obj/item/device/breath_analyzer, +/obj/item/breath_analyzer, /obj/item/surgery/scalpel, /turf/simulated/floor/tiled/white, /area/dungeon/skrell_ship) @@ -234,7 +234,7 @@ /turf/simulated/floor/tiled/white, /area/dungeon/skrell_ship) "aQ" = ( -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, /turf/simulated/floor/tiled/white, /area/dungeon/skrell_ship) "aR" = ( @@ -325,7 +325,7 @@ /area/dungeon/skrell_ship) "bg" = ( /obj/structure/table/skrell, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/machinery/cell_charger, /turf/simulated/floor/shuttle/advanced, /area/dungeon/skrell_ship) @@ -473,7 +473,7 @@ /turf/simulated/floor/shuttle/skrell, /area/dungeon/skrell_ship) "bG" = ( -/obj/item/device/t_scanner, +/obj/item/t_scanner, /turf/simulated/floor/shuttle/advanced, /area/dungeon/skrell_ship) "bH" = ( @@ -595,7 +595,7 @@ /area/dungeon/skrell_ship) "bY" = ( /obj/structure/table/skrell, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light/skrell{ dir = 1 }, @@ -603,7 +603,7 @@ /area/dungeon/skrell_ship) "bZ" = ( /obj/structure/table/skrell, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/machinery/light/skrell{ dir = 1 }, diff --git a/maps/dungeon_spawns/vannatusk_unique.dmm b/maps/dungeon_spawns/vannatusk_unique.dmm index 96b3935b613..2a35c4f5414 100644 --- a/maps/dungeon_spawns/vannatusk_unique.dmm +++ b/maps/dungeon_spawns/vannatusk_unique.dmm @@ -378,7 +378,7 @@ "bp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/standard, -/obj/item/device/camera, +/obj/item/camera, /obj/item/paper{ info = "\[00:02] Recording started.\\\[br\\]\[01:00] Friday Lowell asks, 'Did you have to shoot it with the Lance?'\\\[br\\]\[01:12] Friday Lowell says, 'You completely cooked the animal. Every cell was either blown out from the inside or totally denatured.'\\\[br\\]\[01:30] San Taeyang says, 'You were there, I don't see why you're complaining.'\\\[br\\]\[01:41] William Alsever says, 'Give it a rest, Lowell. We don't need this right now.'\\\[br\\]\[01:57] William Alsever asks, 'Your findings?'\\\[br\\]\[02:32] Friday Lowell says, 'I'm afraid I can't give you much at the cellular level.'\\\[br\\]\[02:56] Friday Lowell says, 'There's not much left inside the membranes. Not many membranes left, for that matter.'\\\[br\\]\[03:19] Friday Lowell says, 'In terms of gross morphology…'\\\[br\\]\[03:56] Friday Lowell says, 'It's all pretty much there on the surface, Humanoid, similarly insectoid outside of that.'\\\[br\\]\[04:10] Friday Lowell says, 'Calcareous exoskeleton, keratinized plastic cuticle. Nothing special.'\\\[br\\]\[04:34] Friday Lowell says, 'Given the environment, I was half-expecting a Sanduloviciu plasma.'\\\[br\\]\[04:52] Friday Lowell says, 'This thing is carbon-based. It's even protein-based, although its proteins are a great deal tougher than ours.'\\\[br\\]\[05:01] San Taeyang asks, 'What does it eat?'\\\[br\\]\[05:21] Friday Lowell says, 'I couldn't say.'\\\[br\\]\[06:35] Friday Lowell says, 'I found gizzard-like contractile around it, which implies they chew on something, or did at some point in their history.'\\\[br\\]\[06:44] Friday Lowell says, 'Besides that...'\\\[br\\]\[07:20] Friday Lowell says, 'Inflate those contractile enough and you create an airtight seal, by the way. In conjunction with the cuticle bits, that would allow this fella to survive briefly in a vacuum.'\\\[br\\]\[07:47] San Taeyang says, 'So it can survive in space.'\\\[br\\]\[07:54] Friday Lowell says, 'In the sense that a dolphin survives underwater. Limited time only.'\\\[br\\]\[08:00] San Taeyang asks, 'How long?'\\\[br\\]\[08:08] Friday Lowell says, 'I'm not certain.'\\\[br\\]\[08:10] Recording stopped."; name = "Recording" @@ -440,7 +440,7 @@ /area/dungeon/bluespace_outpost) "bz" = ( /obj/structure/table/standard, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/asteroid, /area/dungeon/bluespace_outpost) "bA" = ( diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm index f6946ff951c..8f5da7288de 100644 --- a/maps/event/generic_dock/generic_dock-1.dmm +++ b/maps/event/generic_dock/generic_dock-1.dmm @@ -236,7 +236,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) "abX" = ( -/obj/item/device/radio/intercom/south{ +/obj/item/radio/intercom/south{ frequency = 1443; name = "Spec Ops Intercom" }, @@ -431,7 +431,7 @@ /obj/item/rfd_ammo, /obj/item/rfd/construction, /obj/item/rfd/construction, -/obj/item/device/multitool, +/obj/item/multitool, /obj/structure/table/steel, /turf/unsimulated/floor/plating, /area/centcom/specops) @@ -1790,7 +1790,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/officer, /obj/structure/window/reinforced{ dir = 4 @@ -1877,7 +1877,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "aTs" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/shuttle/tan, /area/shuttle/arrival) "aTW" = ( @@ -3037,9 +3037,9 @@ pixel_x = 1; pixel_y = 2 }, -/obj/item/device/camera, -/obj/item/device/megaphone/sec, -/obj/item/device/megaphone/sec, +/obj/item/camera, +/obj/item/megaphone/sec, +/obj/item/megaphone/sec, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -3169,7 +3169,7 @@ pixel_x = 4; pixel_y = 9 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -6; pixel_y = -4 }, @@ -3190,8 +3190,8 @@ }, /area/centcom/control) "cus" = ( -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -4091,7 +4091,7 @@ /obj/item/pinpointer/advpinpointer, /obj/item/rig_module/mounted/plasmacutter, /obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/under/syndicate/combat, /obj/item/gun/energy/rifle/pulse, /obj/item/gun/projectile/revolver/mateba, @@ -4492,7 +4492,7 @@ }, /area/centcom/holding) "ekG" = ( -/obj/item/device/laser_pointer/blue{ +/obj/item/laser_pointer/blue{ pixel_x = -12; pixel_y = 5 }, @@ -4614,7 +4614,7 @@ /obj/item/pinpointer/advpinpointer, /obj/item/rig_module/mounted/plasmacutter, /obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/under/syndicate/combat, /obj/item/gun/energy/rifle/pulse, /obj/item/gun/projectile/revolver/mateba, @@ -5156,7 +5156,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/officer, /turf/unsimulated/floor{ icon_state = "dark_preview" @@ -5676,7 +5676,7 @@ /obj/effect/floor_decal/corner/red/diagonal{ dir = 8 }, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = -22 }, /turf/simulated/floor/tiled/dark, @@ -6571,7 +6571,7 @@ /obj/structure/window/reinforced/crescent{ dir = 1 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor, /area/centcom/ferry) "gSc" = ( @@ -6818,7 +6818,7 @@ pixel_x = 7; pixel_y = 9 }, -/obj/item/device/megaphone/red, +/obj/item/megaphone/red, /obj/effect/floor_decal/corner/red{ dir = 6 }, @@ -6990,7 +6990,7 @@ /turf/unsimulated/wall/darkshuttlewall, /area/centcom/bar) "hpf" = ( -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/corner/blue/diagonal, /turf/unsimulated/floor{ icon_state = "white" @@ -7287,7 +7287,7 @@ }, /area/shuttle/transport1) "hOC" = ( -/obj/item/device/radio/intercom/north{ +/obj/item/radio/intercom/north{ broadcasting = 1; frequency = 1443; listening = 0; @@ -8666,7 +8666,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -2; pixel_y = 6 }, @@ -8977,7 +8977,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/captain, /obj/item/gun/energy/lawgiver, /obj/item/card/id/centcom, @@ -9285,20 +9285,20 @@ /turf/simulated/floor/reinforced, /area/shuttle/administration) "kqN" = ( -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, /obj/structure/table/steel, @@ -9495,8 +9495,8 @@ pixel_y = 2 }, /obj/item/storage/bag/inflatable, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -9887,7 +9887,7 @@ dir = 8 }, /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -10771,7 +10771,7 @@ /area/centcom/control) "mqY" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 2 }, /turf/unsimulated/floor, @@ -11014,7 +11014,7 @@ /obj/item/stack/packageWrap{ pixel_y = 5 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -11497,7 +11497,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/administration) "nnf" = ( -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ frequency = 1441; name = "Spec Ops Intercom"; pixel_y = 20 @@ -11821,7 +11821,7 @@ /obj/structure/table/reinforced/wood, /obj/item/folder/blue, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -12523,8 +12523,8 @@ }, /area/centcom/specops) "oQM" = ( -/obj/item/device/paicard, -/obj/item/device/paicard, +/obj/item/paicard, +/obj/item/paicard, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" @@ -14052,10 +14052,10 @@ /area/tdome/tdome2) "rhK" = ( /obj/structure/table/reinforced, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" @@ -15052,12 +15052,12 @@ }, /area/shuttle/escape) "sZl" = ( -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ @@ -15205,7 +15205,7 @@ dir = 4 }, /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -15674,7 +15674,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "tUh" = ( -/obj/item/device/megaphone{ +/obj/item/megaphone{ pixel_x = -1; pixel_y = 16 }, @@ -17874,10 +17874,10 @@ /area/centcom/specops) "xLO" = ( /obj/structure/closet/crate/freezer/rations, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner/red{ dir = 6 diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index 8c8bb2fd3db..c7b98eb16f6 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -2497,8 +2497,8 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/device/megaphone/stagemicrophone, -/obj/item/device/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, /turf/simulated/floor/carpet/red, /area/city/dining) "ii" = ( @@ -2723,7 +2723,7 @@ /turf/simulated/floor/tiled, /area/city/outside) "ji" = ( -/obj/item/device/flashlight/lamp/stage{ +/obj/item/flashlight/lamp/stage{ pixel_y = -10 }, /turf/simulated/floor/grass, @@ -8325,8 +8325,8 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/device/megaphone/stagemicrophone, -/obj/item/device/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, /turf/simulated/floor/carpet/red, /area/city/dining) "Hk" = ( @@ -8568,7 +8568,7 @@ /turf/simulated/floor/tiled/dark, /area/city/bar) "Ir" = ( -/obj/item/device/flashlight/lamp/stage{ +/obj/item/flashlight/lamp/stage{ pixel_y = 1 }, /turf/simulated/floor/grass, @@ -8930,7 +8930,7 @@ /turf/simulated/floor/marble/dark, /area/city/security) "JQ" = ( -/obj/item/device/flashlight/lamp/stage{ +/obj/item/flashlight/lamp/stage{ pixel_y = -12 }, /turf/simulated/floor/grass, @@ -11822,7 +11822,7 @@ }, /area/city/nouvelle) "TI" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/carpet/red, /area/city/dining) "TO" = ( @@ -12742,7 +12742,7 @@ /turf/simulated/floor/tiled/full, /area/city/outside) "Xf" = ( -/obj/item/device/flashlight/lamp/stage{ +/obj/item/flashlight/lamp/stage{ pixel_y = 3 }, /turf/simulated/floor/grass, diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 86ce66d60d0..dad8e7df121 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -140,7 +140,7 @@ "adY" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -456,7 +456,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/light{ dir = 8 }, @@ -967,7 +967,7 @@ }, /area/cruise/pool/sauna1) "aJq" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1136,7 +1136,7 @@ }, /area/cruise/central) "aQy" = ( -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = -22 }, /turf/unsimulated/floor{ @@ -1164,7 +1164,7 @@ /obj/item/storage/backpack/rucksack/navy, /obj/item/material/knife/tacknife, /obj/structure/closet, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/storage/belt/utility/very_full, /turf/unsimulated/floor{ icon_state = "carpet10-8" @@ -1671,7 +1671,7 @@ /turf/unsimulated/floor, /area/cruise/centerline) "bjA" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1934,7 +1934,7 @@ /area/cruise/main_bar/aft) "brk" = ( /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -2806,7 +2806,7 @@ /area/cruise/beach) "ckz" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 5 }, /turf/unsimulated/floor{ @@ -3325,11 +3325,11 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/unsimulated/floor, /area/cruise/beach) "cFP" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -3366,11 +3366,11 @@ /area/cruise/central) "cGU" = ( /obj/structure/table/stone/marble, -/obj/item/device/megaphone/stagemicrophone{ +/obj/item/megaphone/stagemicrophone{ pixel_x = 8; pixel_y = -3 }, -/obj/item/device/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, /turf/unsimulated/floor, /area/cruise/main_bar/aft) "cIA" = ( @@ -3847,7 +3847,7 @@ /area/cruise/jungle) "daT" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -4229,7 +4229,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/versebook/dpra, +/obj/item/versebook/dpra, /turf/simulated/floor/wood, /area/cruise/pool) "dsS" = ( @@ -4528,7 +4528,7 @@ }, /area/cruise/e_supplies) "dJt" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /obj/effect/floor_decal/spline/plain/black{ dir = 8 }, @@ -4698,7 +4698,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/door/firedoor, /turf/unsimulated/floor{ icon_state = "wood_cherry" @@ -4913,7 +4913,7 @@ dir = 8 }, /obj/structure/table/stone/marble, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -4934,7 +4934,7 @@ }, /area/cruise/jungle) "ejQ" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/landmark/force_spawnpoint{ job_tag = "Passenger" }, @@ -5488,7 +5488,7 @@ /obj/item/storage/backpack/rucksack/navy, /obj/item/material/knife/tacknife, /obj/structure/closet, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /turf/simulated/floor/tiled/dark, /area/cruise/escort) "eDB" = ( @@ -5784,7 +5784,7 @@ pixel_x = -25; pixel_y = 4 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -5942,7 +5942,7 @@ }, /area/cruise/escort) "eZS" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -6299,7 +6299,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -7093,7 +7093,7 @@ }, /area/cruise/pool) "fWc" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled/ramp, /area/cruise/aft) "fWm" = ( @@ -7148,7 +7148,7 @@ /turf/unsimulated/floor, /area/cruise/arcade) "fXP" = ( -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/unsimulated/floor, /area/cruise/arcade) "fYO" = ( @@ -7290,24 +7290,24 @@ }, /area/cruise/virtual_reality) "geN" = ( -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/structure/table/rack, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/structure/railing/mapped, /obj/machinery/light{ dir = 8 @@ -7318,7 +7318,7 @@ /area/cruise/jungle) "gfE" = ( /obj/structure/bed/stool/padded/red, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light/small{ dir = 1 }, @@ -8175,7 +8175,7 @@ /obj/structure/bed/stool/chair/wood{ dir = 4 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -8253,7 +8253,7 @@ }, /area/cruise/security) "gPT" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /obj/effect/floor_decal/spline/plain/black{ dir = 8 }, @@ -8264,7 +8264,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -8559,8 +8559,8 @@ /area/cruise/main_bar/aft) "hdC" = ( /obj/structure/table/wood, -/obj/item/device/camera, -/obj/item/device/camera, +/obj/item/camera, +/obj/item/camera, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -8642,7 +8642,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -9100,43 +9100,43 @@ }, /area/cruise/escort) "hDo" = ( -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = -5 }, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, /obj/structure/table/rack, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = -5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = -5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = -5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = -5 }, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, /turf/unsimulated/floor{ @@ -10508,7 +10508,7 @@ "iOQ" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/crescent, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/decal/fake_object{ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; @@ -10919,7 +10919,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -11097,7 +11097,7 @@ /area/cruise/virtual_reality) "jli" = ( /obj/structure/closet/emcloset, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light/small{ dir = 8 }, @@ -11126,7 +11126,7 @@ /obj/structure/window/reinforced/crescent{ dir = 1 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/machinery/light/small{ dir = 1 }, @@ -11724,7 +11724,7 @@ }, /area/cruise/escort) "jUE" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -11841,8 +11841,8 @@ pixel_x = 9 }, /obj/item/stack/packageWrap, -/obj/item/device/destTagger, -/obj/item/device/hand_labeler, +/obj/item/destTagger, +/obj/item/hand_labeler, /turf/unsimulated/floor{ icon_state = "white" }, @@ -12029,9 +12029,9 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/table/rack, /obj/random/soap, -/obj/item/device/lightreplacer/advanced, -/obj/item/device/lightreplacer/advanced, -/obj/item/device/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -12054,7 +12054,7 @@ /area/cruise/dining_hall) "kkc" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -12796,10 +12796,10 @@ /obj/item/storage/toolbox/lunchbox/scc/filled, /obj/item/clothing/accessory/armband/scc, /obj/item/clothing/glasses/sunglasses/big, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, /obj/item/clothing/accessory/holster/hip, /obj/structure/closet, -/obj/item/device/radio/headset/ert/ccia, +/obj/item/radio/headset/ert/ccia, /turf/simulated/floor/tiled/dark, /area/cruise/escort) "kOy" = ( @@ -14649,7 +14649,7 @@ }, /area/cruise/e_supplies) "mlx" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/unsimulated/floor{ dir = 6; icon_state = "carpet" @@ -14716,7 +14716,7 @@ }, /area/cruise/main_bar/aft) "mpp" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light{ dir = 8 }, @@ -15082,9 +15082,9 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/table/rack, /obj/random/soap, -/obj/item/device/lightreplacer/advanced, -/obj/item/device/lightreplacer/advanced, -/obj/item/device/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -15905,7 +15905,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -15945,7 +15945,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/device/paicard, +/obj/item/paicard, /obj/structure/window/reinforced/crescent, /obj/machinery/light/small{ dir = 4 @@ -16028,7 +16028,7 @@ /area/cruise/escort) "nyD" = ( /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -16555,8 +16555,8 @@ /area/cruise/security) "nSN" = ( /obj/structure/table/steel, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, /turf/unsimulated/floor{ icon_state = "plating" }, @@ -17361,7 +17361,7 @@ }, /area/cruise/security) "oAK" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -17486,12 +17486,12 @@ /turf/unsimulated/floor/plating, /area/cruise/pool/sauna1) "oJl" = ( -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ @@ -17722,7 +17722,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled/ramp, /area/cruise/centerline) "oVa" = ( @@ -18819,7 +18819,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -18885,7 +18885,7 @@ /obj/item/flame/candle{ pixel_x = 9 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 5 }, /turf/unsimulated/floor, @@ -18920,18 +18920,18 @@ /area/cruise/escort) "pSr" = ( /obj/structure/table/steel, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /turf/unsimulated/floor{ icon_state = "floor7" }, @@ -19001,7 +19001,7 @@ /area/cruise/fore_p) "pWh" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/red, +/obj/item/flashlight/lamp/lava/red, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -19835,9 +19835,9 @@ /area/cruise/virtual_reality) "qKD" = ( /obj/structure/table/rack, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -20201,7 +20201,7 @@ /area/cruise/pool) "rei" = ( /obj/structure/table/wood, -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -20472,13 +20472,13 @@ /area/cruise/main_bar) "rri" = ( /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/unsimulated/floor{ icon_state = "dark_preview" }, /area/cruise/escort) "rrj" = ( -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = -22 }, /turf/unsimulated/floor{ @@ -20723,7 +20723,7 @@ "rzJ" = ( /obj/effect/floor_decal/corner/black/diagonal, /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -20763,7 +20763,7 @@ }, /area/cruise/escort) "rCz" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -20912,7 +20912,7 @@ /obj/item/rfd_ammo, /obj/item/rfd/construction, /obj/item/rfd/construction, -/obj/item/device/multitool, +/obj/item/multitool, /obj/structure/table/steel, /obj/effect/floor_decal/corner/yellow/diagonal, /turf/unsimulated/floor{ @@ -21156,7 +21156,7 @@ /area/cruise/aft) "rWF" = ( /obj/structure/table/steel, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 @@ -21337,7 +21337,7 @@ /turf/simulated/floor/reinforced, /area/cruise/virtual_reality) "sek" = ( -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = -22 }, /turf/unsimulated/floor{ @@ -22121,7 +22121,7 @@ /area/cruise/central) "sQm" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/red, +/obj/item/flashlight/lamp/lava/red, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -22726,7 +22726,7 @@ dir = 4 }, /obj/structure/table/stone/marble, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -23518,7 +23518,7 @@ /area/cruise/dining_hall) "tRu" = ( /obj/random/pottedplant, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -23545,20 +23545,20 @@ /turf/simulated/floor/beach/water/pool, /area/cruise/pool) "tUl" = ( -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, /obj/structure/table/steel, @@ -23726,7 +23726,7 @@ /area/cruise/jungle) "tYk" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/unsimulated/floor{ icon_state = "carpet" }, @@ -24290,7 +24290,7 @@ /area/cruise/hangar) "usO" = ( /obj/machinery/bluespace_beacon, -/obj/item/device/radio/beacon, +/obj/item/radio/beacon, /turf/unsimulated/floor, /area/cruise/tcomms_sat) "usR" = ( @@ -24538,9 +24538,9 @@ /area/cruise/arcade) "uDB" = ( /obj/structure/table/rack, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/effect/decal/fake_object/light_source{ desc = "A cozy lamp."; icon = 'icons/effects/32x96.dmi'; @@ -24626,7 +24626,7 @@ }, /area/cruise/beach) "uGN" = ( -/obj/item/device/camera, +/obj/item/camera, /obj/structure/table/stone/marble, /turf/unsimulated/floor{ icon_state = "wood_cherry" @@ -24912,7 +24912,7 @@ }, /area/cruise/jungle) "uRK" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -24953,7 +24953,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/device/paicard, +/obj/item/paicard, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -25263,10 +25263,10 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 5 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light{ dir = 8 }, @@ -26101,7 +26101,7 @@ /obj/structure/window/reinforced/crescent{ dir = 1 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/wood, /turf/unsimulated/floor{ dir = 8; @@ -26356,7 +26356,7 @@ /turf/unsimulated/floor, /area/cruise/arcade) "whR" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor, /area/cruise/beach) "whY" = ( @@ -26797,7 +26797,7 @@ /turf/unsimulated/floor, /area/cruise/main_bar) "wFi" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/unsimulated/floor{ icon_state = "floor7" }, @@ -27041,7 +27041,7 @@ /area/cruise/escort) "wNo" = ( /obj/structure/table/stone/marble, -/obj/item/device/camera, +/obj/item/camera, /turf/unsimulated/floor, /area/cruise/main_bar/aft) "wON" = ( @@ -27323,7 +27323,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -27409,7 +27409,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled/ramp/bottom, /area/cruise/aft) "xhh" = ( @@ -27666,7 +27666,7 @@ /turf/unsimulated/floor, /area/template_noop) "xpJ" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -27946,24 +27946,24 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /obj/structure/table/rack, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -27991,7 +27991,7 @@ dir = 9 }, /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -28644,7 +28644,7 @@ /area/cruise/beach_cave) "ygx" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/door/firedoor, /turf/unsimulated/floor{ dir = 8; diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 6590549256a..55db09fa4a9 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -176,10 +176,10 @@ /obj/item/storage/toolbox/lunchbox/scc/filled, /obj/item/clothing/accessory/armband/scc, /obj/item/clothing/glasses/sunglasses/big, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, /obj/item/clothing/accessory/holster/hip, /obj/structure/closet, -/obj/item/device/radio/headset/ert/ccia, +/obj/item/radio/headset/ert/ccia, /turf/simulated/floor/tiled/dark, /area/city/mendell) "aL" = ( @@ -738,7 +738,7 @@ }, /area/city/mendell/interior) "dV" = ( -/obj/item/device/versebook/dpra, +/obj/item/versebook/dpra, /turf/simulated/floor/carpet, /area/city/mendell/interior) "dZ" = ( @@ -967,8 +967,8 @@ "fd" = ( /obj/machinery/light/small, /obj/structure/table/rack, -/obj/item/device/lightreplacer/advanced, -/obj/item/device/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, +/obj/item/lightreplacer/advanced, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -2090,7 +2090,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/city) "lv" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/unsimulated/floor, /area/city/mendell/interior) "lw" = ( @@ -2536,7 +2536,7 @@ }, /area/city/mendell/interior) "oB" = ( -/obj/item/device/flashlight/lamp/lava/orange, +/obj/item/flashlight/lamp/lava/orange, /obj/structure/table/stone/marble, /turf/unsimulated/floor{ icon_state = "asphalt"; @@ -2627,7 +2627,7 @@ /area/city/mendell/interior) "pb" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/city/mendell/interior) "pc" = ( @@ -3092,7 +3092,7 @@ /obj/item/storage/backpack/rucksack/navy, /obj/item/material/knife/tacknife, /obj/structure/closet, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /turf/simulated/floor/tiled/dark, /area/city/mendell) "rH" = ( @@ -4502,7 +4502,7 @@ pixel_y = 35 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/city/mendell/interior) "At" = ( @@ -4644,7 +4644,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/megaphone/stagemicrophone, +/obj/item/megaphone/stagemicrophone, /obj/structure/table/stone/marble, /turf/unsimulated/floor{ icon_state = "wood_cherry" @@ -4917,7 +4917,7 @@ /area/city/mendell/interior) "CK" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "wood_preview" }, @@ -5210,9 +5210,9 @@ pixel_x = 1; pixel_y = 2 }, -/obj/item/device/camera, -/obj/item/device/megaphone/sec, -/obj/item/device/megaphone/sec, +/obj/item/camera, +/obj/item/megaphone/sec, +/obj/item/megaphone/sec, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -5269,7 +5269,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/lino, /area/city/mendell/interior) "Eq" = ( @@ -5312,7 +5312,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/lino, /area/city/mendell/interior) "EF" = ( @@ -5406,11 +5406,11 @@ pixel_y = 33 }, /obj/structure/table/wood, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -5652,7 +5652,7 @@ }, /area/city/mendell/interior) "Hs" = ( -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/lino, /area/city/mendell/interior) "Hw" = ( @@ -6006,7 +6006,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) "JG" = ( @@ -6708,10 +6708,10 @@ /turf/simulated/floor/wood, /area/city/mendell) "Ne" = ( -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/floor_decal/industrial/hatch, /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/city/mendell) "Nh" = ( @@ -7703,15 +7703,15 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, -/obj/item/device/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, +/obj/item/radio/headset/raider, /turf/simulated/floor/tiled/dark, /area/city/mendell) "SG" = ( @@ -7754,7 +7754,7 @@ pixel_x = 13; pixel_y = 5 }, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, /turf/simulated/floor/lino, /area/city/mendell) "SX" = ( @@ -8156,7 +8156,7 @@ /area/city/mendell) "Vo" = ( /obj/structure/table/stone/marble, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/wood, /area/city/mendell/interior) "Vv" = ( diff --git a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm index 8b28f6ce229..d759237c253 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm @@ -68,27 +68,27 @@ /area/scc_event_shuttle) "bA" = ( /obj/structure/table/standard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 9; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -3; pixel_x = -9 }, @@ -672,13 +672,13 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) @@ -703,32 +703,32 @@ /area/scc_event_shuttle) "jo" = ( /obj/structure/table/standard, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ @@ -751,7 +751,7 @@ /turf/simulated/floor/carpet/rubber, /area/scc_event_shuttle) "ka" = ( -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gpstag = "DROPSHIP" }, /turf/simulated/floor, @@ -1045,16 +1045,16 @@ /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, /obj/item/storage/box/led_collars{ @@ -1425,12 +1425,12 @@ pixel_y = 9; pixel_x = 8 }, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) @@ -1699,7 +1699,7 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, /obj/item/crowbar/red{ @@ -1750,110 +1750,110 @@ pixel_y = 5; pixel_x = -4 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, @@ -2325,10 +2325,10 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/ipc_tag_scanner, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -2583,10 +2583,10 @@ /obj/item/rfd_ammo, /obj/item/rfd_ammo, /obj/item/rfd_ammo, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, @@ -2801,14 +2801,14 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled, /area/scc_event_shuttle) "Qb" = ( @@ -3220,14 +3220,14 @@ /obj/structure/closet/crate{ name = "GPS units" }, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled, /area/scc_event_shuttle) "XH" = ( @@ -3246,16 +3246,16 @@ /area/scc_event_shuttle) "XS" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, /obj/machinery/light{ dir = 1 }, -/obj/item/device/vending_refill/encryption, +/obj/item/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "XU" = ( @@ -3356,12 +3356,12 @@ /obj/structure/closet/crate{ name = "observational equipment" }, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/samplebags, diff --git a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm index ae079b98f0c..7aa72a432e4 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm @@ -164,7 +164,7 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, /obj/item/crowbar/red{ @@ -215,110 +215,110 @@ pixel_y = 5; pixel_x = -4 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, @@ -507,12 +507,12 @@ /obj/structure/closet/crate{ name = "observational equipment" }, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/samplebags, @@ -1013,13 +1013,13 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/scc_event_shuttle) @@ -1092,27 +1092,27 @@ /area/scc_event_shuttle) "qg" = ( /obj/structure/table/standard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 9; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -3; pixel_x = -9 }, @@ -1655,16 +1655,16 @@ /area/scc_event_shuttle) "yA" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, /obj/machinery/light{ dir = 1 }, -/obj/item/device/vending_refill/encryption, +/obj/item/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "yM" = ( @@ -2037,16 +2037,16 @@ /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, /obj/item/storage/box/led_collars{ @@ -2591,12 +2591,12 @@ pixel_y = 9; pixel_x = 8 }, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/scc_event_shuttle) @@ -2646,14 +2646,14 @@ /obj/structure/closet/crate{ name = "GPS units" }, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled, /area/scc_event_shuttle) "Pp" = ( @@ -2865,32 +2865,32 @@ /area/scc_event_shuttle) "Th" = ( /obj/structure/table/standard, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ @@ -2920,10 +2920,10 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/ipc_tag_scanner, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -2939,7 +2939,7 @@ /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "Um" = ( -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gpstag = "DROPSHIP" }, /turf/simulated/floor, @@ -2988,14 +2988,14 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/item/wrench, /obj/item/wrench, /obj/item/wrench, @@ -3020,10 +3020,10 @@ /obj/item/rfd_ammo, /obj/item/rfd_ammo, /obj/item/rfd_ammo, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, diff --git a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm index 4c30f410bb8..dac98664271 100644 --- a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm +++ b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm @@ -312,10 +312,10 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/ipc_tag_scanner, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -442,16 +442,16 @@ /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, /obj/item/storage/box/led_collars{ @@ -745,10 +745,10 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/ipc_tag_scanner, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -1129,14 +1129,14 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/item/wrench, /obj/item/wrench, /obj/item/wrench, @@ -1158,12 +1158,12 @@ /obj/structure/closet/crate{ name = "observational equipment" }, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/samplebags, @@ -1426,14 +1426,14 @@ /obj/structure/closet/crate{ name = "GPS units" }, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled, /area/scc_event_shuttle) "wq" = ( @@ -1483,10 +1483,10 @@ /obj/item/rfd_ammo, /obj/item/rfd_ammo, /obj/item/rfd_ammo, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, @@ -1761,7 +1761,7 @@ /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/reagent_containers/dropper/electronic_pipette, /obj/item/reagent_containers/dropper/electronic_pipette, /turf/simulated/floor/tiled/white, @@ -2038,12 +2038,12 @@ pixel_y = 9; pixel_x = 8 }, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/scc_event_shuttle) @@ -2369,13 +2369,13 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/scc_event_shuttle) @@ -2455,27 +2455,27 @@ /area/scc_event_shuttle) "QX" = ( /obj/structure/table/standard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 9; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -3; pixel_x = -9 }, @@ -2593,16 +2593,16 @@ /area/scc_event_shuttle) "Tk" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, /obj/machinery/light{ dir = 1 }, -/obj/item/device/vending_refill/encryption, +/obj/item/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "TJ" = ( @@ -2671,32 +2671,32 @@ /area/scc_event_shuttle) "UO" = ( /obj/structure/table/standard, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ @@ -2762,7 +2762,7 @@ /turf/simulated/floor/tiled/white, /area/scc_event_shuttle) "VN" = ( -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gpstag = "DROPSHIP" }, /turf/simulated/floor, @@ -3070,7 +3070,7 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, /obj/item/crowbar/red{ @@ -3121,110 +3121,110 @@ pixel_y = 5; pixel_x = -4 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, diff --git a/maps/helpers/event_shuttles/sccv_artemis.dmm b/maps/helpers/event_shuttles/sccv_artemis.dmm index 7078973f834..cd9d87c5b83 100644 --- a/maps/helpers/event_shuttles/sccv_artemis.dmm +++ b/maps/helpers/event_shuttles/sccv_artemis.dmm @@ -41,51 +41,51 @@ /obj/item/crowbar, /obj/item/crowbar, /obj/item/crowbar, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -8; pixel_x = 4 }, @@ -291,12 +291,12 @@ pixel_x = 8 }, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, /turf/simulated/floor/tiled/steel, /area/scc_event_shuttle) "eX" = ( @@ -310,58 +310,58 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, /turf/simulated/floor/tiled/dark, @@ -1532,16 +1532,16 @@ /area/scc_event_shuttle) "zK" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, /obj/machinery/light{ dir = 1 }, -/obj/item/device/vending_refill/encryption, +/obj/item/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "zX" = ( @@ -1781,59 +1781,59 @@ pixel_y = 5; pixel_x = -4 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = 7; pixel_y = 5 }, @@ -1965,32 +1965,32 @@ /area/scc_event_shuttle) "FN" = ( /obj/structure/table/standard, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 16 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, /obj/effect/floor_decal/spline/plain/green{ @@ -2185,34 +2185,34 @@ pixel_y = -5; pixel_x = 6 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = -8 }, /turf/simulated/floor/tiled/dark, @@ -2308,14 +2308,14 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/item/wrench, /obj/item/wrench, /obj/item/wrench, @@ -2461,16 +2461,16 @@ /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, /turf/simulated/floor/tiled/dark, @@ -2513,10 +2513,10 @@ /obj/item/rfd_ammo, /obj/item/rfd_ammo, /obj/effect/floor_decal/industrial/outline/operations, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, @@ -2530,7 +2530,7 @@ /turf/simulated/floor/tiled, /area/scc_event_shuttle) "Ml" = ( -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gpstag = "DROPSHIP" }, /turf/simulated/floor, @@ -2749,13 +2749,13 @@ /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, /obj/item/clothing/gloves/yellow, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/steel, /area/scc_event_shuttle) "Pe" = ( @@ -3008,10 +3008,10 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/ipc_tag_scanner, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -3055,27 +3055,27 @@ /area/scc_event_shuttle) "Tw" = ( /obj/structure/table/standard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 9; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -3; pixel_x = -9 }, diff --git a/maps/helpers/event_shuttles/sccv_packrat.dmm b/maps/helpers/event_shuttles/sccv_packrat.dmm index 55ac366ad05..d8edf5732f3 100644 --- a/maps/helpers/event_shuttles/sccv_packrat.dmm +++ b/maps/helpers/event_shuttles/sccv_packrat.dmm @@ -165,14 +165,14 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/item/wrench, /obj/item/wrench, /obj/item/wrench, @@ -203,16 +203,16 @@ /area/scc_event_shuttle) "ed" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, -/obj/item/device/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, +/obj/item/megaphone/command, /obj/machinery/light{ dir = 1 }, -/obj/item/device/vending_refill/encryption, +/obj/item/vending_refill/encryption, /turf/simulated/floor/tiled/dark, /area/scc_event_shuttle) "ex" = ( @@ -309,16 +309,16 @@ /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, /obj/item/clothing/accessory/armband/sec, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 14 }, /obj/machinery/light{ @@ -386,7 +386,7 @@ /turf/simulated/floor/tiled/full, /area/scc_event_shuttle) "hG" = ( -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ gpstag = "DROPSHIP" }, /turf/simulated/floor, @@ -1001,12 +1001,12 @@ /obj/structure/closet/crate{ name = "GPS units" }, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, -/obj/item/device/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, +/obj/item/gps/science, /turf/simulated/floor/tiled, /area/scc_event_shuttle) "uu" = ( @@ -1041,27 +1041,27 @@ /area/scc_event_shuttle) "vW" = ( /obj/structure/table/standard, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 9; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 3; pixel_x = -9 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = -3; pixel_x = -9 }, @@ -1100,18 +1100,18 @@ /area/scc_event_shuttle) "xA" = ( /obj/structure/closet/crate, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/gps/medical, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/gps/medical, +/obj/item/gps/medical, +/obj/item/gps/medical, +/obj/item/gps/medical, +/obj/item/gps/medical, +/obj/item/gps/medical, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/effect/floor_decal/industrial/outline/medical, /turf/simulated/floor/tiled, /area/scc_event_shuttle) @@ -1179,10 +1179,10 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/ipc_tag_scanner, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, @@ -1447,10 +1447,10 @@ /obj/item/rfd_ammo, /obj/item/rfd_ammo, /obj/item/rfd_ammo, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, +/obj/item/paint_sprayer, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, /obj/item/taperoll/engineering, @@ -1573,7 +1573,7 @@ /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/reagent_containers/dropper/electronic_pipette, /obj/item/reagent_containers/dropper/electronic_pipette, /obj/effect/floor_decal/industrial/outline/medical, @@ -1765,12 +1765,12 @@ /obj/structure/closet/crate{ name = "observational equipment" }, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera_film, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/fancy/vials, /obj/item/storage/box/samplebags, @@ -1913,12 +1913,12 @@ pixel_y = 9; pixel_x = 8 }, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, -/obj/item/device/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, +/obj/item/gps/engineering, /obj/effect/floor_decal/industrial/outline/operations, /turf/simulated/floor/tiled, /area/scc_event_shuttle) @@ -2283,55 +2283,55 @@ /obj/structure/table/rack/retail_shelf{ name = "shelves" }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, /obj/item/crowbar/red{ @@ -2382,55 +2382,55 @@ pixel_y = 5; pixel_x = -4 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -9 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -3 }, /obj/effect/floor_decal/industrial/outline/red, diff --git a/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm b/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm index df694ee92b7..fc948015c8e 100644 --- a/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm +++ b/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm @@ -116,15 +116,15 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/hand_labeler{ +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/hand_labeler{ pixel_x = 7; pixel_y = 10 }, @@ -479,15 +479,15 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/hand_labeler{ +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/hand_labeler{ pixel_x = 7; pixel_y = 10 }, @@ -840,15 +840,15 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/hand_labeler{ +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/hand_labeler{ pixel_x = 7; pixel_y = 10 }, @@ -942,15 +942,15 @@ pixel_x = 10 }, /obj/structure/table/standard, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/radio/sec/off, -/obj/item/device/hand_labeler{ +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/radio/sec/off, +/obj/item/hand_labeler{ pixel_x = 7; pixel_y = 10 }, diff --git a/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm b/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm index 0f690307cd5..633468ef61d 100644 --- a/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm +++ b/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm @@ -835,7 +835,7 @@ /obj/item/storage/box/fancy/candle_box, /obj/item/reagent_containers/toothpaste, /obj/item/reagent_containers/toothpaste, -/obj/item/device/quikpay, +/obj/item/quikpay, /obj/item/storage/box/fancy/matches, /obj/item/storage/box/shells/beanbags, /obj/item/storage/box/shells/beanbags, @@ -1193,7 +1193,7 @@ /area/space) "AH" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 9 }, /obj/machinery/light_switch{ @@ -2013,7 +2013,7 @@ /area/space) "PK" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 9 }, /obj/machinery/light_switch{ @@ -2233,7 +2233,7 @@ /obj/item/storage/box/fancy/candle_box, /obj/item/reagent_containers/toothpaste, /obj/item/reagent_containers/toothpaste, -/obj/item/device/quikpay, +/obj/item/quikpay, /obj/item/storage/box/fancy/matches, /obj/item/storage/box/shells/beanbags, /obj/item/storage/box/shells/beanbags, @@ -2408,7 +2408,7 @@ /area/space) "XA" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 9 }, /turf/simulated/floor/wood, @@ -2544,7 +2544,7 @@ /area/space) "ZA" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/wood, /area/space) "ZB" = ( diff --git a/maps/helpers/pre_fabricated/massfab_industrial.dmm b/maps/helpers/pre_fabricated/massfab_industrial.dmm index d0f1376751d..14e07aaf1de 100644 --- a/maps/helpers/pre_fabricated/massfab_industrial.dmm +++ b/maps/helpers/pre_fabricated/massfab_industrial.dmm @@ -20,7 +20,7 @@ }, /obj/structure/table/steel, /obj/item/storage/belt/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/steel, /area/space) "aS" = ( @@ -235,7 +235,7 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled/steel, @@ -411,7 +411,7 @@ /obj/effect/floor_decal/spline/plain/orange, /obj/structure/table/steel, /obj/item/storage/belt/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/steel, /area/space) "sW" = ( @@ -576,7 +576,7 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled/steel, @@ -713,7 +713,7 @@ }, /obj/structure/table/steel, /obj/item/storage/belt/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/steel, /area/space) "Ep" = ( @@ -722,7 +722,7 @@ }, /obj/structure/table/steel, /obj/item/storage/belt/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/tiled/steel, /area/space) "EV" = ( @@ -802,7 +802,7 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled/steel, @@ -1145,7 +1145,7 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, -/obj/item/device/robotanalyzer, +/obj/item/robotanalyzer, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /turf/simulated/floor/tiled/steel, diff --git a/maps/helpers/pre_fabricated/massfab_medical.dmm b/maps/helpers/pre_fabricated/massfab_medical.dmm index 79e6230c263..a1bbfc1d5a3 100644 --- a/maps/helpers/pre_fabricated/massfab_medical.dmm +++ b/maps/helpers/pre_fabricated/massfab_medical.dmm @@ -164,7 +164,7 @@ /obj/item/storage/box/unique/sharps{ pixel_x = -5 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = 6; pixel_y = 2 }, @@ -578,7 +578,7 @@ /obj/item/storage/box/unique/sharps{ pixel_x = -5 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = 6; pixel_y = 2 }, @@ -631,7 +631,7 @@ "kO" = ( /obj/structure/table/stone/marble, /obj/item/clipboard, -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, /turf/simulated/floor/tiled/full, /area/space) "kP" = ( @@ -1057,11 +1057,11 @@ pixel_x = -8; pixel_y = 4 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = 6; pixel_y = 8 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = 6; pixel_y = 8 }, @@ -2025,7 +2025,7 @@ /area/space) "He" = ( /obj/structure/table/standard, -/obj/item/device/advanced_healthanalyzer, +/obj/item/advanced_healthanalyzer, /turf/simulated/floor/tiled/white, /area/space) "Hq" = ( @@ -2144,7 +2144,7 @@ /obj/item/storage/box/unique/sharps{ pixel_x = -5 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = 6; pixel_y = 2 }, @@ -2341,11 +2341,11 @@ pixel_x = 8; pixel_y = 4 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -6; pixel_y = 8 }, @@ -2414,7 +2414,7 @@ /obj/item/storage/box/unique/sharps{ pixel_x = -5 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = 6; pixel_y = 2 }, @@ -3147,32 +3147,32 @@ /area/space) "Xe" = ( /obj/structure/table/standard, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 6 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 5; pixel_y = 6 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, /obj/item/storage/belt/medical/paramedic, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm index dc34921b33a..f612232e894 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm @@ -412,7 +412,7 @@ "GR" = ( /obj/structure/table/rack, /obj/machinery/light/small, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/concrete/square, /area/exoplanet/adhomai) "Ht" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm index 8abeb6d803c..e2db5ec2c04 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm @@ -3,7 +3,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen/black, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 15 }, /turf/simulated/floor/exoplanet/carpet/rubber, @@ -130,9 +130,9 @@ /area/adhomai_archeology) "z" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/light/small{ dir = 8 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index cd86abfe539..a2ff5a96444 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -334,7 +334,7 @@ /area/adhomai_bar) "sE" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/key/door_key, /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) @@ -514,7 +514,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/exoplanet/lino/diamond, /area/adhomai_bar) "Fl" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm index 16bf846618d..221549388f7 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm @@ -234,7 +234,7 @@ /area/adhomai_fallout_bunker) "jz" = ( /obj/structure/table/standard, -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/light{ dir = 8 }, @@ -318,12 +318,12 @@ /area/adhomai_fallout_bunker) "mV" = ( /obj/structure/table/standard, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -390,7 +390,7 @@ /area/adhomai_fallout_bunker) "nQ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, @@ -474,7 +474,7 @@ /area/adhomai_fallout_bunker) "pT" = ( /obj/structure/table/standard, -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/light{ dir = 4; status = 2 @@ -691,11 +691,11 @@ /area/adhomai_fallout_bunker) "wn" = ( /obj/structure/closet/crate, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/effect/floor_decal/corner/red{ dir = 10 }, @@ -883,7 +883,7 @@ /area/adhomai_fallout_bunker) "CW" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -1070,7 +1070,7 @@ /area/adhomai_fallout_bunker) "KG" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1199,10 +1199,10 @@ /obj/item/shovel, /obj/item/shovel, /obj/item/shovel, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/item/pickaxe/drill, /obj/item/pickaxe/drill, /obj/item/pickaxe/drill, @@ -1250,7 +1250,7 @@ /area/adhomai_fallout_bunker) "Rw" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm index 2ca95d0b706..bedac07cfae 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm @@ -128,8 +128,8 @@ /area/adhomai_hunting) "pI" = ( /obj/structure/closet/crate/drop, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "qU" = ( @@ -201,7 +201,7 @@ /area/exoplanet/adhomai) "BM" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "Cy" = ( @@ -275,7 +275,7 @@ /obj/item/ammo_magazine/boltaction, /obj/item/ammo_magazine/boltaction, /obj/item/clothing/suit/storage/tajaran/hunting, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "Nd" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm index 59153ac1e65..9c8b09b8099 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm @@ -143,7 +143,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "lI" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/wood, /turf/simulated/floor/exoplanet/carpet/art, /area/adhomai_raskariim_hideout) @@ -393,7 +393,7 @@ /area/adhomai_raskariim_hideout) "zd" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 6; pixel_x = 5 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm index e6c51ac09b5..5f0ce49736d 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm @@ -53,7 +53,7 @@ /obj/item/cell/super, /obj/item/stock_parts/capacitor/adv, /obj/item/stock_parts/micro_laser/high, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 9 }, /obj/structure/sign/flag/pra{ @@ -85,7 +85,7 @@ /area/adhomai_schlorrgo_cage) "k" = ( /obj/item/shovel, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 5; pixel_x = 8 }, @@ -291,7 +291,7 @@ /obj/item/cell/super, /obj/item/stock_parts/manipulator/nano, /obj/item/stock_parts/scanning_module/adv, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 9 }, /obj/structure/sign/flag/pra{ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm index e5764de9d30..09eb0aff30c 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm @@ -73,7 +73,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/silo_guard/get_id_access() return list(ACCESS_PRA) diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm index 66c63455d8e..5532da6f49d 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm @@ -47,7 +47,7 @@ /obj/item/flame/lighter/adhomai, /obj/item/storage/field_ration/army, /obj/item/storage/firstaid/regular, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /turf/simulated/floor/concrete{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 9b26adedfca..7d3519f31da 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -24,7 +24,7 @@ /area/adhomai_village) "aF" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/light/small{ dir = 4 }, @@ -209,7 +209,7 @@ /area/adhomai_village) "na" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "nD" = ( @@ -874,7 +874,7 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /obj/item/saddle, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "Wa" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dm b/maps/random_ruins/exoplanets/adhomai/ala_base.dm index b5e16c68ddd..08fe97b44b1 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dm @@ -55,7 +55,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/ala_base/get_id_access() return list(ACCESS_DPRA) diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm index be847bb80b7..b935f72d9a9 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm @@ -204,7 +204,7 @@ /area/ala_base) "lI" = ( /obj/structure/table/wood, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 8 }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra{ @@ -475,10 +475,10 @@ /area/ala_base) "vJ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 9 }, -/obj/item/device/versebook/dpra{ +/obj/item/versebook/dpra{ pixel_y = 1; pixel_x = 4 }, @@ -632,12 +632,12 @@ /area/ala_base) "zJ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood, /area/ala_base) "zQ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 12; pixel_x = 5 }, @@ -1061,7 +1061,7 @@ /area/ala_base) "Rg" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/light{ dir = 8 }, @@ -1101,7 +1101,7 @@ /obj/structure/sign/painting_frame/nated{ pixel_y = 32 }, -/obj/item/device/versebook/dpra, +/obj/item/versebook/dpra, /obj/structure/table/standard, /turf/simulated/floor/exoplanet/wood, /area/ala_base) diff --git a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm index cd77e4475cb..a96a863ace5 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm @@ -59,8 +59,8 @@ /area/exoplanet/adhomai) "v" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "x" = ( @@ -150,9 +150,9 @@ /obj/structure/sign/painting_frame/nated{ pixel_y = 32 }, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "U" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dm b/maps/random_ruins/exoplanets/adhomai/nka_base.dm index 97eb5577c0f..437db9c6a3b 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dm @@ -57,7 +57,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/nka_base/get_id_access() return list(ACCESS_NKA) diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm index a75074a07a5..caa47c05d3e 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm @@ -483,7 +483,7 @@ /area/nka_base) "Em" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 12; pixel_x = 5 }, @@ -568,7 +568,7 @@ /area/nka_base) "NW" = ( /obj/structure/table/wood, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /obj/item/storage/box/fancy/cigarettes/cigar, /obj/item/flame/lighter/adhomai, /obj/machinery/light/small{ @@ -635,7 +635,7 @@ /area/nka_base) "Up" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/sign/flag/nka/large/north{ pixel_y = 32 }, @@ -658,7 +658,7 @@ /area/nka_base) "Vy" = ( /obj/structure/table/wood, -/obj/item/device/versebook/nka, +/obj/item/versebook/nka, /turf/simulated/floor/exoplanet/wood, /area/nka_base) "VN" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm index ddcefb36aed..34eea7efbe9 100644 --- a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm +++ b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dm @@ -48,7 +48,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/nka_polar_explorer/get_id_access() return list(ACCESS_NKA) @@ -85,7 +85,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/nka_polar_sailor/get_id_access() return list(ACCESS_NKA) diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm index 9fdea363c25..c8a8f69c232 100644 --- a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm +++ b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm @@ -153,9 +153,9 @@ /area/exoplanet/adhomai) "x" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/light/small{ dir = 8 }, @@ -182,7 +182,7 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen/black, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 15 }, /turf/simulated/floor/exoplanet/carpet/rubber, @@ -305,8 +305,8 @@ /area/adhomai_archeology) "W" = ( /obj/structure/table/rack, -/obj/item/device/binoculars/spyglass, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/exoplanet/carpet/rubber, /area/adhomai_archeology) "X" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dm b/maps/random_ruins/exoplanets/adhomai/pra_base.dm index f1a0da63194..f34a5558e2a 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dm @@ -57,7 +57,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/pra_base/get_id_access() return list(ACCESS_PRA) @@ -93,6 +93,6 @@ /obj/item/storage/box/hadii_manifesto = 1, /obj/item/storage/box/hadii_card = 1 ) - l_hand = /obj/item/device/megaphone + l_hand = /obj/item/megaphone accessory = /obj/item/clothing/accessory/hadii_pin diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm index c27dd6528c3..2567c938fc2 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm @@ -6,7 +6,7 @@ /obj/item/clothing/suit/storage/tajaran/pra_jacket/armored, /obj/item/clothing/head/beret/tajaran/pra, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /obj/item/clothing/accessory/badge/pra_passport, /turf/simulated/floor/concrete/square{ temperature = 268.15 @@ -830,10 +830,10 @@ /area/pra_base) "Fk" = ( /obj/structure/table/wood, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_y = 8 }, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/art{ temperature = 278.15 }, @@ -845,7 +845,7 @@ /area/exoplanet/adhomai) "FZ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/sign/flag/pra/large/south{ pixel_y = -32 }, @@ -1057,13 +1057,13 @@ /obj/item/clothing/shoes/jackboots/tajara, /obj/item/clothing/accessory/holster/hip, /obj/item/storage/backpack/satchel/leather, -/obj/item/device/radio/headset/ship, +/obj/item/radio/headset/ship, /obj/item/clothing/accessory/badge/pra_passport, /obj/item/ammo_magazine/a50, /obj/item/ammo_magazine/a50, /obj/item/storage/box/hadii_manifesto, /obj/item/storage/box/hadii_card, -/obj/item/device/megaphone, +/obj/item/megaphone, /obj/item/clothing/accessory/hadii_pin, /obj/item/flame/lighter/adhomai, /obj/item/clothing/under/tajaran/army_commissar, @@ -1106,7 +1106,7 @@ /obj/item/clothing/suit/storage/tajaran/pra_jacket/armored, /obj/item/clothing/head/beret/tajaran/pra, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /obj/item/clothing/accessory/badge/pra_passport, /obj/structure/sign/flag/pra/large/south{ pixel_y = -32 @@ -1223,7 +1223,7 @@ /obj/structure/sign/painting_frame/hadii{ pixel_y = 32 }, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm index a45db16ef4b..8aba7ca1531 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm @@ -51,7 +51,7 @@ shoes = /obj/item/clothing/shoes/workboots/tajara belt = /obj/item/storage/belt/mining back = /obj/item/storage/backpack/industrial - l_pocket = /obj/item/device/radio/hailing + l_pocket = /obj/item/radio/hailing l_ear = null diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm index 90649f45948..1ef7bd1f583 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm @@ -46,7 +46,7 @@ /area/pra_mining_camp) "eJ" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) "ft" = ( @@ -214,16 +214,16 @@ /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) "wx" = ( -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/structure/closet/toolcloset/empty, /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) "wW" = ( @@ -515,9 +515,9 @@ /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /turf/simulated/floor/exoplanet/concrete, diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm index c194edad644..242fe574231 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm @@ -67,7 +67,7 @@ id = /obj/item/card/id r_pocket = /obj/item/storage/wallet/random - l_pocket = /obj/item/device/radio + l_pocket = /obj/item/radio /obj/outfit/admin/psis_outpost/get_id_access() return list(ACCESS_PRA) diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm index 6a21001f911..bb9d3de0766 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm @@ -77,11 +77,11 @@ /area/psis_outpost) "dP" = ( /obj/structure/table/standard, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/machinery/light/small/red{ dir = 1 }, -/obj/item/device/camera/adhomai, +/obj/item/camera/adhomai, /turf/simulated/floor/reinforced{ temperature = 268.15 }, @@ -282,9 +282,9 @@ dir = 4; status = 2 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, +/obj/item/binoculars, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, @@ -299,7 +299,7 @@ /area/psis_outpost) "oR" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/reinforced{ temperature = 268.15 }, @@ -815,7 +815,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ pixel_x = 8; pixel_y = 8 @@ -843,7 +843,7 @@ /obj/effect/floor_decal/corner/red/full{ dir = 8 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/sign/flag/pra/large/north{ pixel_y = 32 }, @@ -937,9 +937,9 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, -/obj/item/device/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, +/obj/item/versebook/pra, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm index b5e9de11624..b3126729a92 100644 --- a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm +++ b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm @@ -1423,7 +1423,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 2; pixel_x = -7 }, @@ -3598,10 +3598,10 @@ /area/abandoned_prison/bathroom) "YZ" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft, /obj/structure/window/reinforced{ diff --git a/maps/random_ruins/exoplanets/asteroid/carp_nest/carp_nest.dmm b/maps/random_ruins/exoplanets/asteroid/carp_nest/carp_nest.dmm index a452fa11c4a..36982a875c9 100644 --- a/maps/random_ruins/exoplanets/asteroid/carp_nest/carp_nest.dmm +++ b/maps/random_ruins/exoplanets/asteroid/carp_nest/carp_nest.dmm @@ -37,7 +37,7 @@ /turf/template_noop, /area/exoplanet/barren/asteroid) "j" = ( -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ on = 1 }, /obj/effect/landmark/clear, diff --git a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm index 1e7e9218822..2cda781d5b8 100644 --- a/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coalition_base/coalition_base.dmm @@ -32,7 +32,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -1458,7 +1458,7 @@ /area/coalition_base/barracks) "EC" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 11; pixel_x = -7 }, diff --git a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm index 428d140ce2d..5dccf695eb3 100644 --- a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm @@ -668,7 +668,7 @@ /area/template_noop) "nG" = ( /obj/effect/decal/cleanable/liquid_fuel, -/obj/item/device/suit_cooling_unit/no_cell, +/obj/item/suit_cooling_unit/no_cell, /turf/simulated/floor/airless, /area/template_noop) "nH" = ( @@ -778,7 +778,7 @@ }, /obj/item/stack/cable_coil/random, /obj/item/cell, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -6; pixel_y = 14 }, @@ -1255,7 +1255,7 @@ /area/template_noop) "Bc" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/structure/table/reinforced/steel, /turf/simulated/floor/tiled/dark/airless, /area/template_noop) diff --git a/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm b/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm index e8464cbead1..f300f06e24e 100644 --- a/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/crashed_pod/crashed_pod_unique.dmm @@ -115,7 +115,7 @@ /turf/simulated/floor/shuttle/dark_blue/airless, /area/template_noop) "x" = ( -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/shuttle/dark_blue/airless, /area/template_noop) "y" = ( diff --git a/maps/random_ruins/exoplanets/asteroid/digsite/digsite_unique.dmm b/maps/random_ruins/exoplanets/asteroid/digsite/digsite_unique.dmm index 07886592e79..3bdde329275 100644 --- a/maps/random_ruins/exoplanets/asteroid/digsite/digsite_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/digsite/digsite_unique.dmm @@ -189,7 +189,7 @@ /area/dungeon/anomaly_outpost) "aG" = ( /obj/structure/table/standard, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled, /area/dungeon/anomaly_outpost) "aH" = ( diff --git a/maps/random_ruins/exoplanets/asteroid/escape_pod/escape_pod_unique.dmm b/maps/random_ruins/exoplanets/asteroid/escape_pod/escape_pod_unique.dmm index 48c4f60f47b..b00b7047dec 100644 --- a/maps/random_ruins/exoplanets/asteroid/escape_pod/escape_pod_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/escape_pod/escape_pod_unique.dmm @@ -80,7 +80,7 @@ /obj/random/voidsuit, /obj/random/energy_antag, /obj/random/smalltank, -/obj/item/device/gps, +/obj/item/gps, /obj/item/archaeological_find, /turf/simulated/floor/shuttle/dark_blue/airless, /area/template_noop) diff --git a/maps/random_ruins/exoplanets/asteroid/mining_base/mining_base.dmm b/maps/random_ruins/exoplanets/asteroid/mining_base/mining_base.dmm index 9f6b8d81bba..a7e9c914ef6 100644 --- a/maps/random_ruins/exoplanets/asteroid/mining_base/mining_base.dmm +++ b/maps/random_ruins/exoplanets/asteroid/mining_base/mining_base.dmm @@ -118,7 +118,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/structure/table/reinforced/steel, /turf/simulated/floor/airless/ceiling, /area/template_noop) diff --git a/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm index 63d711b5354..3a060a8fc8c 100644 --- a/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/mystery_ship/mystery_ship_unique.dmm @@ -612,7 +612,7 @@ pixel_y = 2 }, /obj/structure/table/reinforced, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, diff --git a/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm index e0ef3c2bb9c..26293bf6c25 100644 --- a/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/satellite_crash/satellite_crash_unique.dmm @@ -41,7 +41,7 @@ "i" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/structure/computerframe, -/obj/item/device/gps, +/obj/item/gps, /obj/item/material/shard, /turf/simulated/floor/airless, /area/dungeon/crashed_satellite) diff --git a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm index f5102e434ea..b1aeff176ef 100644 --- a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm @@ -148,7 +148,7 @@ /area/template_noop) "at" = ( /obj/structure/table/skrell, -/obj/item/device/hearing_aid/skrell{ +/obj/item/hearing_aid/skrell{ pixel_y = 4; pixel_x = -3 }, @@ -234,7 +234,7 @@ /turf/simulated/floor/shuttle/skrell/blue/airless, /area/template_noop) "aE" = ( -/obj/item/device/breath_analyzer{ +/obj/item/breath_analyzer{ pixel_x = 4; pixel_y = 5 }, @@ -340,7 +340,7 @@ /turf/simulated/floor/tiled/white, /area/template_noop) "aQ" = ( -/obj/item/device/flashlight/pen, +/obj/item/flashlight/pen, /obj/effect/floor_decal/corner/mauve{ dir = 9 }, @@ -485,7 +485,7 @@ /area/template_noop) "bg" = ( /obj/structure/table/skrell, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/machinery/cell_charger, /turf/simulated/floor/tiled/dark/full, /area/template_noop) @@ -686,7 +686,7 @@ /turf/simulated/floor/shuttle/skrell/airless, /area/template_noop) "bG" = ( -/obj/item/device/t_scanner{ +/obj/item/t_scanner{ pixel_x = -8; pixel_y = -4 }, @@ -790,7 +790,7 @@ /area/template_noop) "bY" = ( /obj/structure/table/skrell, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/machinery/light/skrell{ dir = 1 }, @@ -802,7 +802,7 @@ /area/template_noop) "bZ" = ( /obj/structure/table/skrell, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/machinery/light/skrell{ dir = 1 }, diff --git a/maps/random_ruins/exoplanets/biesel/pra_camp_site.dmm b/maps/random_ruins/exoplanets/biesel/pra_camp_site.dmm index 321dc0819f2..cea9dc6f795 100644 --- a/maps/random_ruins/exoplanets/biesel/pra_camp_site.dmm +++ b/maps/random_ruins/exoplanets/biesel/pra_camp_site.dmm @@ -160,7 +160,7 @@ pixel_x = -6; pixel_y = 8 }, -/obj/item/device/versebook/pra{ +/obj/item/versebook/pra{ pixel_x = 10; pixel_y = 6 }, diff --git a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm index 874d8e1a90b..ceecec22ec8 100644 --- a/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm +++ b/maps/random_ruins/exoplanets/burzsia/burzsia_mining.dmm @@ -12,7 +12,7 @@ /area/burzsia_mining) "bk" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp/lava/yellow, +/obj/item/flashlight/lamp/lava/yellow, /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/dark, /area/burzsia_mining/foreman) @@ -178,8 +178,8 @@ /obj/item/plastique/seismic, /obj/item/gun/custom_ka/frame01/prebuilt, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/radio, +/obj/item/flashlight/lantern, +/obj/item/radio, /obj/item/stack/flag/yellow, /obj/item/stack/flag/yellow, /turf/simulated/floor/tiled/steel, @@ -592,8 +592,8 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/mining, /obj/item/clothing/head/helmet/space/void/mining, -/obj/item/device/suit_cooling_unit, -/obj/item/device/gps/mining, +/obj/item/suit_cooling_unit, +/obj/item/gps/mining, /turf/simulated/floor/tiled/steel, /area/burzsia_mining/mining) "oN" = ( @@ -616,11 +616,11 @@ /obj/item/plastique/seismic, /obj/item/gun/custom_ka/frame01/prebuilt, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/alarm/west{ req_one_access = list(202) }, -/obj/item/device/radio, +/obj/item/radio, /obj/item/stack/flag/yellow, /obj/item/stack/flag/yellow, /turf/simulated/floor/tiled/steel, @@ -804,7 +804,7 @@ /area/burzsia_mining/engineering) "tP" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, @@ -1036,11 +1036,11 @@ /obj/item/plastique/seismic, /obj/item/gun/custom_ka/frame01/prebuilt, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio, +/obj/item/radio, /obj/item/stack/flag/yellow, /obj/item/stack/flag/yellow, /turf/simulated/floor/tiled/steel, @@ -1334,7 +1334,7 @@ /area/burzsia_mining/mining) "EF" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, @@ -1733,9 +1733,9 @@ /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -1858,9 +1858,9 @@ /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -2003,11 +2003,11 @@ /obj/item/plastique/seismic, /obj/item/gun/custom_ka/frame01/prebuilt, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio, +/obj/item/radio, /obj/item/stack/flag/yellow, /obj/item/stack/flag/yellow, /turf/simulated/floor/tiled/steel, diff --git a/maps/random_ruins/exoplanets/delivery/delivery_site.dmm b/maps/random_ruins/exoplanets/delivery/delivery_site.dmm index b2757120436..dd6406d3c31 100644 --- a/maps/random_ruins/exoplanets/delivery/delivery_site.dmm +++ b/maps/random_ruins/exoplanets/delivery/delivery_site.dmm @@ -141,7 +141,7 @@ /obj/structure/closet/crate, /obj/item/storage/backpack/duffel/orion, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/random/tech_supply, /obj/random/tool, /obj/item/crowbar, diff --git a/maps/random_ruins/exoplanets/desert/desert_camp/desert_camp.dmm b/maps/random_ruins/exoplanets/desert/desert_camp/desert_camp.dmm index 6999ceab826..e9a75196e20 100644 --- a/maps/random_ruins/exoplanets/desert/desert_camp/desert_camp.dmm +++ b/maps/random_ruins/exoplanets/desert/desert_camp/desert_camp.dmm @@ -43,7 +43,7 @@ /obj/structure/table/rack/folding_table, /obj/item/clothing/suit/hazmat/anomaly, /obj/item/clothing/head/hazmat/anomaly, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/exoplanet/desert, /area/template_noop) "v" = ( @@ -98,7 +98,7 @@ /area/template_noop) "X" = ( /obj/structure/table/rack/folding_table, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/exoplanet/desert, /area/template_noop) "Z" = ( diff --git a/maps/random_ruins/exoplanets/desert/desert_comms/desert_comms.dmm b/maps/random_ruins/exoplanets/desert/desert_comms/desert_comms.dmm index 15569ff0ba8..a0a2ec29605 100644 --- a/maps/random_ruins/exoplanets/desert/desert_comms/desert_comms.dmm +++ b/maps/random_ruins/exoplanets/desert/desert_comms/desert_comms.dmm @@ -173,7 +173,7 @@ /turf/simulated/floor/tiled/techmaint, /area/desert_comms) "fb" = ( -/obj/item/device/flashlight/flare/glowstick/red{ +/obj/item/flashlight/flare/glowstick/red{ on = 1 }, /turf/simulated/floor/exoplanet/desert, @@ -332,9 +332,9 @@ /obj/item/clothing/suit/armor/carrier/military{ starting_accessories = list(/obj/item/clothing/accessory/armor_plate/military,/obj/item/clothing/accessory/storage/modular_pouch) }, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/belt/military, /obj/item/storage/belt/military, /obj/item/storage/belt/military, @@ -851,7 +851,7 @@ /obj/structure/closet/crate/tool, /obj/item/clothing/head/welding, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1; level = 2 @@ -1319,7 +1319,7 @@ /obj/structure/table/rack, /obj/effect/decal/cleanable/dirt, /obj/item/newspaper, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled, /area/desert_comms) "Ky" = ( diff --git a/maps/random_ruins/exoplanets/desert/smuggler_hideout/smuggler_hideout.dmm b/maps/random_ruins/exoplanets/desert/smuggler_hideout/smuggler_hideout.dmm index 10b232204c6..ef492417d37 100644 --- a/maps/random_ruins/exoplanets/desert/smuggler_hideout/smuggler_hideout.dmm +++ b/maps/random_ruins/exoplanets/desert/smuggler_hideout/smuggler_hideout.dmm @@ -17,7 +17,7 @@ /area/template_noop) "f" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /obj/structure/lattice/catwalk/indoor/planks{ name = "duckboard" }, @@ -63,7 +63,7 @@ /area/template_noop) "o" = ( /obj/structure/table/wood, -/obj/item/device/radio, +/obj/item/radio, /obj/random/dirt_75, /turf/simulated/floor/wood, /area/template_noop) @@ -197,14 +197,14 @@ /area/template_noop) "O" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/wood, /area/template_noop) "P" = ( /turf/simulated/wall/wood, /area/template_noop) "R" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /obj/structure/table/wood, /obj/structure/lattice/catwalk/indoor/planks{ name = "duckboard" diff --git a/maps/random_ruins/exoplanets/grove/batcave/batcave.dmm b/maps/random_ruins/exoplanets/grove/batcave/batcave.dmm index 0625fb47176..c0879a74420 100644 --- a/maps/random_ruins/exoplanets/grove/batcave/batcave.dmm +++ b/maps/random_ruins/exoplanets/grove/batcave/batcave.dmm @@ -136,7 +136,7 @@ /turf/simulated/floor/exoplanet/grass/grove, /area/template_noop) "N" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/barren, /area/template_noop) "P" = ( @@ -161,7 +161,7 @@ /turf/simulated/floor/exoplanet/barren, /area/template_noop) "S" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 7; pixel_x = -6 }, @@ -187,7 +187,7 @@ /turf/simulated/floor/exoplanet/barren, /area/template_noop) "X" = ( -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, /turf/simulated/floor/exoplanet/barren, /area/template_noop) diff --git a/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm b/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm index b5cdfbcb6df..8740ea6e73b 100644 --- a/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm +++ b/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm @@ -27,7 +27,7 @@ id = /obj/item/card/id/freighter_crew_ship - l_ear = /obj/item/device/radio/headset/ship + l_ear = /obj/item/radio/headset/ship backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( diff --git a/maps/random_ruins/exoplanets/grove/hut/hut.dmm b/maps/random_ruins/exoplanets/grove/hut/hut.dmm index 17d29e441ba..148039e3ce3 100644 --- a/maps/random_ruins/exoplanets/grove/hut/hut.dmm +++ b/maps/random_ruins/exoplanets/grove/hut/hut.dmm @@ -37,7 +37,7 @@ /turf/simulated/floor/wood, /area/template_noop) "l" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/stone/marble, /turf/simulated/floor/wood, /area/template_noop) diff --git a/maps/random_ruins/exoplanets/grove/sdf_outpost/sdf_outpost.dmm b/maps/random_ruins/exoplanets/grove/sdf_outpost/sdf_outpost.dmm index 79b9b380db0..1f0e1bafef3 100644 --- a/maps/random_ruins/exoplanets/grove/sdf_outpost/sdf_outpost.dmm +++ b/maps/random_ruins/exoplanets/grove/sdf_outpost/sdf_outpost.dmm @@ -158,7 +158,7 @@ /turf/simulated/floor/tiled, /area/grove_sdf_outpost) "ls" = ( -/obj/item/device/flashlight/maglight/on, +/obj/item/flashlight/maglight/on, /turf/simulated/floor/exoplanet/grass/grove, /area/grove_sdf_outpost) "lG" = ( @@ -171,7 +171,7 @@ opened = 1; req_access = null }, -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/belt/military, /obj/item/storage/belt/military, /turf/simulated/floor/tiled, @@ -679,7 +679,7 @@ /obj/structure/closet/crate/tool, /obj/item/clothing/head/welding, /obj/item/clothing/gloves/yellow, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/grove_sdf_outpost) "MM" = ( @@ -721,7 +721,7 @@ pixel_y = 30; req_access = null }, -/obj/item/device/gps, +/obj/item/gps, /turf/simulated/floor/tiled, /area/grove_sdf_outpost) "OW" = ( diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dmm b/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dmm index 7b03893c22d..96200449b3a 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dmm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_mining.dmm @@ -349,7 +349,7 @@ /area/haneunim_mining) "su" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/tiled/rust, /area/haneunim_mining) "ta" = ( @@ -674,11 +674,11 @@ /area/haneunim_mining) "Nm" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/tiled/rust, /area/haneunim_mining) "Nt" = ( diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm b/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm index 7dec7c7e4b8..4f11e145855 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_refugees.dm @@ -21,7 +21,7 @@ corpseuniform = /obj/item/clothing/under/gearharness corpsesuit = /obj/item/clothing/suit/space/emergency corpsehelmet = /obj/item/clothing/head/helmet/space/emergency - corpseback = /obj/item/device/suit_cooling_unit/no_cell + corpseback = /obj/item/suit_cooling_unit/no_cell corpseshoes = /obj/item/clothing/shoes/magboots corpseid = FALSE species = SPECIES_IPC diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm index 586f68f334f..dec7d619ed1 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm @@ -82,7 +82,7 @@ /area/konyang_telecomms_outpost) "dB" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -2; pixel_y = 6 }, @@ -394,8 +394,8 @@ /obj/structure/closet/secure_closet/guncabinet{ req_access = null }, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled, /area/konyang_telecomms_outpost) "uk" = ( @@ -745,7 +745,7 @@ /obj/structure/table/steel, /obj/item/paper_bin, /obj/item/pen/black, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ pixel_y = 10; pixel_x = 10 }, @@ -974,7 +974,7 @@ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ pixel_y = 10; pixel_x = -10 }, diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm index e79ef3cf702..1f0c8081bc7 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm @@ -637,7 +637,7 @@ /obj/item/pen/black{ pixel_y = 13 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 1; pixel_x = -5 }, @@ -1674,7 +1674,7 @@ /area/konyang_village) "Xq" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood, /area/konyang_village) "Xy" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm index 189790175c6..e7c51ec87ff 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm @@ -254,7 +254,7 @@ /area/exoplanet/grass/konyang) "jW" = ( /obj/structure/table/steel, -/obj/item/device/assembly/timer, +/obj/item/assembly/timer, /obj/random/dirt_75, /turf/simulated/floor/sidewalk/dark, /area/konyang/arms_factory) @@ -274,7 +274,7 @@ /area/exoplanet/grass/konyang) "kh" = ( /obj/structure/table/steel, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/random/dirt_75, /turf/simulated/floor/sidewalk/dark, /area/konyang/arms_factory) @@ -294,7 +294,7 @@ /area/konyang/arms_factory) "kZ" = ( /obj/structure/table/steel, -/obj/item/device/assembly/timer, +/obj/item/assembly/timer, /turf/simulated/floor/foundation, /area/konyang/arms_factory) "lo" = ( @@ -355,7 +355,7 @@ /area/konyang/arms_factory) "mP" = ( /obj/structure/table/steel, -/obj/item/device/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, /obj/random/dirt_75, /obj/random/energy, /turf/simulated/floor/foundation, @@ -486,7 +486,7 @@ /area/konyang/arms_factory) "rq" = ( /obj/structure/table/steel, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/foundation, /area/konyang/arms_factory) "rT" = ( @@ -521,7 +521,7 @@ /area/konyang/arms_factory) "tn" = ( /obj/structure/table/steel, -/obj/item/device/assembly/igniter, +/obj/item/assembly/igniter, /obj/random/dirt_75, /turf/simulated/floor/foundation, /area/konyang/arms_factory) @@ -540,7 +540,7 @@ /area/exoplanet/grass/konyang) "tW" = ( /obj/structure/table/steel, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_y = 5 }, /obj/random/dirt_75, @@ -585,7 +585,7 @@ /area/exoplanet/grass/konyang) "vT" = ( /obj/structure/table/steel, -/obj/item/device/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, /turf/simulated/floor/sidewalk/dark, /area/konyang/arms_factory) "wj" = ( @@ -610,7 +610,7 @@ /area/exoplanet/grass/konyang) "wU" = ( /obj/structure/table/standard, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/pen, /turf/simulated/floor/sidewalk/dark, /area/konyang/arms_factory) @@ -685,7 +685,7 @@ /area/exoplanet/grass/konyang) "zC" = ( /obj/structure/table/steel, -/obj/item/device/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, /turf/simulated/floor/foundation, /area/konyang/arms_factory) "Ay" = ( @@ -696,7 +696,7 @@ /area/exoplanet/grass/konyang) "BD" = ( /obj/structure/table/steel, -/obj/item/device/assembly/prox_sensor, +/obj/item/assembly/prox_sensor, /obj/random/energy, /turf/simulated/floor/foundation, /area/konyang/arms_factory) @@ -739,8 +739,8 @@ /area/exoplanet/grass/konyang) "Dq" = ( /obj/structure/table/steel, -/obj/item/device/assembly/signaler, -/obj/item/device/assembly/igniter{ +/obj/item/assembly/signaler, +/obj/item/assembly/igniter{ pixel_x = 9; pixel_y = 12 }, @@ -846,7 +846,7 @@ /area/exoplanet/grass/konyang) "Iv" = ( /obj/structure/table/steel, -/obj/item/device/assembly/timer, +/obj/item/assembly/timer, /turf/simulated/floor/sidewalk/dark, /area/konyang/arms_factory) "ID" = ( @@ -1031,7 +1031,7 @@ /area/exoplanet/grass/konyang) "PZ" = ( /obj/structure/table/steel, -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, /turf/simulated/floor/sidewalk/dark, /area/konyang/arms_factory) "Qk" = ( @@ -1235,7 +1235,7 @@ /area/exoplanet/grass/konyang) "Zl" = ( /obj/structure/table/steel, -/obj/item/device/assembly/signaler, +/obj/item/assembly/signaler, /turf/simulated/floor/foundation, /area/konyang/arms_factory) "Zz" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm index d4c2e5b68ef..95c9719be91 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm @@ -64,7 +64,7 @@ "ek" = ( /obj/random/dirt_75, /obj/structure/table, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/sidewalk/dark, /area/konyang/robotics_factory) @@ -119,7 +119,7 @@ /area/exoplanet/grass/konyang) "hD" = ( /obj/structure/table/rack/retail_shelf, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/reinforced, /area/konyang/robotics_factory) "hJ" = ( @@ -172,7 +172,7 @@ /area/exoplanet/grass/konyang) "jW" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/off, +/obj/item/flashlight/lamp/off, /turf/simulated/floor/foundation, /area/konyang/robotics_factory) "jZ" = ( @@ -476,7 +476,7 @@ /turf/simulated/floor/foundation, /area/konyang/robotics_factory) "xg" = ( -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/sidewalk/dark/grid, /area/konyang/robotics_factory) "xo" = ( @@ -648,7 +648,7 @@ /area/exoplanet/grass/konyang) "HZ" = ( /obj/structure/table/glass, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/reinforced, /area/konyang/robotics_factory) "Im" = ( @@ -813,7 +813,7 @@ /area/konyang/robotics_factory) "PL" = ( /obj/structure/table/glass, -/obj/item/device/multitool, +/obj/item/multitool, /turf/simulated/floor/reinforced, /area/konyang/robotics_factory) "PZ" = ( @@ -948,7 +948,7 @@ /area/exoplanet/grass/konyang) "Yb" = ( /obj/structure/table/rack/retail_shelf, -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/simulated/floor/reinforced, /area/konyang/robotics_factory) "Yc" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm index 622b841b4f2..a1265e50bb0 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm @@ -156,7 +156,7 @@ /area/exoplanet/grass/konyang) "jB" = ( /obj/item/mop, -/obj/item/device/flashlight/empty, +/obj/item/flashlight/empty, /turf/simulated/floor/exoplanet/sidewalk/dark, /area/konyang/house_small) "jL" = ( @@ -175,7 +175,7 @@ "jZ" = ( /obj/random/dirt_75, /obj/item/extinguisher/mini, -/obj/item/device/measuring_tape{ +/obj/item/measuring_tape{ pixel_y = 2 }, /turf/simulated/floor/exoplanet/foundation, @@ -354,7 +354,7 @@ pixel_x = -8; pixel_y = 6 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/wrench, /turf/simulated/floor/exoplanet/sidewalk/dark, /area/konyang/house_small) @@ -715,7 +715,7 @@ /area/konyang/house_small) "Ob" = ( /obj/structure/table/glass, -/obj/item/device/flashlight/lamp/off, +/obj/item/flashlight/lamp/off, /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) "Oi" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm index 76751814f6e..735e0f2da40 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm @@ -169,11 +169,11 @@ /obj/effect/decal/road_marking/no_pass{ dir = 4 }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining{ +/obj/item/gps/mining, +/obj/item/gps/mining{ pixel_x = -7 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 6 }, /obj/structure/table/rack, @@ -1478,7 +1478,7 @@ }, /obj/machinery/recharger, /obj/structure/table/wood, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /turf/simulated/floor/wood, @@ -1651,7 +1651,7 @@ /obj/item/wrench, /obj/machinery/light/small, /obj/item/clothing/gloves/yellow, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/item/extinguisher, /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center_abandoned/reactor) @@ -1811,7 +1811,7 @@ "xD" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/carpet/magenta, @@ -2053,7 +2053,7 @@ /area/konyang_landing_zone) "Ab" = ( /obj/structure/bed/stool/chair/sofa/left/red, -/obj/item/device/laser_pointer, +/obj/item/laser_pointer, /turf/simulated/floor/carpet/magenta, /area/konyang_landing_zone/command_center_abandoned/living) "Aj" = ( @@ -2121,7 +2121,7 @@ /obj/item/clothing/gloves/yellow, /obj/item/storage/box/lights/bulbs, /obj/item/storage/box/lights, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center_abandoned/garage) "AQ" = ( @@ -2209,7 +2209,7 @@ /area/konyang_landing_zone/command_center_abandoned/greenhouse) "BM" = ( /obj/machinery/shipsensors/weak, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_x = -23; name = "static GPS (Command Center)"; gpstag = "SCC-FOB" @@ -2841,7 +2841,7 @@ dir = 1 }, /obj/item/pen, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center_abandoned) "IE" = ( @@ -3028,21 +3028,21 @@ /obj/item/stack/material/glass/full{ pixel_y = 9 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/ano_scanner{ +/obj/item/ano_scanner{ pixel_x = -5 }, -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center_abandoned) "KU" = ( @@ -3713,8 +3713,8 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/camera, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera_film, /obj/item/tape_roll{ pixel_x = 14 }, @@ -4060,7 +4060,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center_abandoned/living) "Ye" = ( @@ -4165,7 +4165,7 @@ /obj/item/clothing/accessory/armband/scc, /obj/item/flag/scc, /obj/item/flag/scc, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/carpet/purple, /area/konyang_landing_zone/command_center_abandoned/living) "ZL" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/office.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/office.dmm index 33fc32272bb..57388b4a8b6 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/office.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/office.dmm @@ -75,7 +75,7 @@ /obj/effect/decal/cleanable/generic, /obj/structure/table/standard, /obj/item/folder/red, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_y = 5; pixel_x = 13 }, diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm index 99822accdb5..703ab1a8a46 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dm @@ -23,7 +23,7 @@ corpseshoes = /obj/item/clothing/shoes/jackboots corpsehelmet = /obj/item/clothing/head/konyang/police corpsebelt = /obj/item/storage/belt/security - corpsepocket2 = /obj/item/device/radio + corpsepocket2 = /obj/item/radio corpsepocket1 = /obj/item/storage/wallet/random corpseback = /obj/item/storage/backpack/satchel corpseid = FALSE diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm index 0c3d160f27b..7d3c954383c 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/rural_clinic.dmm @@ -123,10 +123,10 @@ /area/konyang/rural_clinic) "qz" = ( /obj/structure/table/rack/retail_shelf, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = -1 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = 6 }, /turf/simulated/floor/tiled/white, diff --git a/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm b/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm index 81600e0821e..4262ec7580e 100644 --- a/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm @@ -84,7 +84,7 @@ dir = 4; pixel_y = 6 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 12; pixel_x = 2 }, @@ -157,7 +157,7 @@ /obj/structure/railing/fence{ name = "railing" }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 12; pixel_x = 2 }, @@ -848,9 +848,9 @@ /obj/item/extinguisher/mini, /obj/item/reagent_containers/extinguisher_refill/filled, /obj/item/reagent_containers/extinguisher_refill/filled, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/clothing/suit/storage/toggle/konyang/pants, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/item/cell/device/high, /obj/item/storage/belt/utility/atmostech, /obj/item/clothing/accessory/storage/webbing, @@ -858,7 +858,7 @@ name = "\improper fire-proof gloves"; desc = "These fire-proof gloves are somewhat fire and impact-resistant." }, -/obj/item/device/radio/eng, +/obj/item/radio/eng, /obj/item/clothing/suit/storage/toggle/highvis, /turf/simulated/floor/wood, /area/konyang_fireoutpost) @@ -909,7 +909,7 @@ dir = 8; pixel_y = 3 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 12; pixel_x = 2 }, @@ -917,7 +917,7 @@ pixel_x = 6; pixel_y = 2 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = -2; pixel_y = -2 }, @@ -934,7 +934,7 @@ dir = 1; pixel_y = 13 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 12; pixel_x = 2 }, diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm index af73d75d15c..ceb044f1074 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm @@ -211,7 +211,7 @@ /area/space) "ei" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 5; pixel_y = -3 }, @@ -408,7 +408,7 @@ /turf/simulated/floor/exoplanet/barren/cave, /area/hivebot_burrows_1) "hJ" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 7; pixel_x = -6 }, @@ -571,7 +571,7 @@ /turf/simulated/floor/exoplanet/barren, /area/space) "kJ" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/structure/lattice/catwalk/indoor/planks{ name = "duckboard" }, @@ -799,7 +799,7 @@ "qE" = ( /obj/random/dirt_75, /obj/structure/flora/rock/konyang/small, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 7; pixel_x = -6 }, @@ -846,7 +846,7 @@ /turf/simulated/floor/exoplanet/barren/cave, /area/space) "ro" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 7; pixel_x = -6 }, @@ -1330,7 +1330,7 @@ /turf/simulated/floor/exoplanet/barren, /area/space) "Bt" = ( -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 8; pixel_y = 6 }, @@ -1769,7 +1769,7 @@ /area/hivebot_burrows_1) "KD" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 7; pixel_x = -6 }, @@ -1912,7 +1912,7 @@ /turf/simulated/floor/exoplanet/barren/cave, /area/hivebot_burrows_1) "NB" = ( -/obj/item/device/radio, +/obj/item/radio, /obj/structure/lattice/catwalk/indoor/planks{ name = "duckboard" }, @@ -1947,7 +1947,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/space) "NU" = ( -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 7; pixel_x = -6 }, @@ -2179,7 +2179,7 @@ /area/hivebot_burrows_1) "SN" = ( /obj/random/dirt_75, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/exoplanet/basalt/cave, /area/hivebot_burrows_1) "Tf" = ( @@ -2452,7 +2452,7 @@ "YF" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 12; pixel_x = 4 }, @@ -2467,7 +2467,7 @@ /area/hivebot_burrows_1) "Za" = ( /obj/random/dirt_75, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 12 }, @@ -2539,13 +2539,13 @@ /area/hivebot_burrows_1) "ZK" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_y = 4; pixel_x = -4 }, /obj/effect/decal/cleanable/floor_damage/random_wood_broken, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/wood, /area/hivebot_burrows_1) "ZL" = ( diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm index fc83beb508c..dde1af92bd4 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm @@ -43,7 +43,7 @@ "ba" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6; pixel_x = 5 }, @@ -78,7 +78,7 @@ "bO" = ( /obj/structure/flora/rock/konyang/small, /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6; pixel_x = 5 }, @@ -488,7 +488,7 @@ /area/space) "gC" = ( /obj/random/dirt_75, -/obj/item/device/measuring_tape{ +/obj/item/measuring_tape{ pixel_x = 6; pixel_y = 12 }, @@ -920,7 +920,7 @@ "mY" = ( /obj/random/dirt_75, /obj/item/archaeological_find, -/obj/item/device/core_sampler{ +/obj/item/core_sampler{ pixel_y = 12; pixel_x = -8 }, @@ -1298,7 +1298,7 @@ /area/hivebot_burrows_2) "sM" = ( /obj/random/dirt_75, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 9 }, /obj/effect/decal/cleanable/blood/drip{ @@ -1432,7 +1432,7 @@ "ug" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/basalt/cave, /area/hivebot_burrows_2) "uh" = ( @@ -1648,7 +1648,7 @@ "wR" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/depth_scanner{ +/obj/item/depth_scanner{ pixel_x = 8 }, /turf/simulated/floor/exoplanet/basalt/cave, @@ -1692,11 +1692,11 @@ /area/space) "xz" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 6; pixel_x = -2 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_y = -4; pixel_x = 2 }, @@ -1736,7 +1736,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/device/integrated_circuit_printer/upgraded{ +/obj/item/integrated_circuit_printer/upgraded{ pixel_x = -10 }, /obj/effect/floor_decal/spline/plain/black{ @@ -1850,7 +1850,7 @@ "zS" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/ano_scanner{ +/obj/item/ano_scanner{ pixel_x = -4; pixel_y = 12 }, @@ -1995,7 +1995,7 @@ dir = 10 }, /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ on = 0 }, /obj/machinery/atmospherics/unary/vent_scrubber{ @@ -2025,7 +2025,7 @@ "BU" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/ano_scanner{ +/obj/item/ano_scanner{ pixel_x = -4; pixel_y = 2 }, @@ -2153,7 +2153,7 @@ /area/hivebot_burrows_2) "Er" = ( /obj/random/dirt_75, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 5; pixel_y = -4 }, @@ -2183,7 +2183,7 @@ /obj/structure/flora/rock/konyang/small, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6; pixel_x = 5 }, @@ -2341,7 +2341,7 @@ /area/hivebot_burrows_2) "GO" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6; pixel_x = 5 }, @@ -2386,7 +2386,7 @@ dries = 0; basecolor = "#400000" }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -10; pixel_y = 2 }, @@ -2596,7 +2596,7 @@ /obj/structure/flora/rock/konyang/small, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/core_sampler{ +/obj/item/core_sampler{ pixel_y = 12; pixel_x = -4 }, @@ -2817,7 +2817,7 @@ /area/hivebot_burrows_2) "OK" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -3; pixel_y = 8; on = 0 @@ -2973,7 +2973,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 6; pixel_y = 14 }, @@ -3454,7 +3454,7 @@ "Wk" = ( /obj/random/dirt_75, /obj/random/dirt_75, -/obj/item/device/measuring_tape{ +/obj/item/measuring_tape{ pixel_x = 6; pixel_y = 12 }, @@ -3622,7 +3622,7 @@ /area/hivebot_burrows_2) "Yx" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6; pixel_x = 5 }, diff --git a/maps/random_ruins/exoplanets/konyang/homestead.dmm b/maps/random_ruins/exoplanets/konyang/homestead.dmm index 025458ae482..fcdb8aab867 100644 --- a/maps/random_ruins/exoplanets/konyang/homestead.dmm +++ b/maps/random_ruins/exoplanets/konyang/homestead.dmm @@ -455,7 +455,7 @@ }, /obj/structure/railing/fence, /obj/structure/table/rack/cafe_table, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 12; pixel_x = 2 }, diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index ee97807c949..ea9b8ba9be4 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -173,11 +173,11 @@ /obj/effect/decal/road_marking/no_pass{ dir = 4 }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining{ +/obj/item/gps/mining, +/obj/item/gps/mining{ pixel_x = -7 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 6 }, /obj/structure/table/rack, @@ -1445,7 +1445,7 @@ }, /obj/machinery/recharger, /obj/structure/table/wood, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /turf/simulated/floor/wood, @@ -1611,7 +1611,7 @@ /obj/item/wrench, /obj/machinery/light/small, /obj/item/clothing/gloves/yellow, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/item/extinguisher, /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center/reactor) @@ -1774,7 +1774,7 @@ "xD" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/carpet/magenta, @@ -2005,7 +2005,7 @@ /area/konyang_landing_zone) "Ab" = ( /obj/structure/bed/stool/chair/sofa/left/red, -/obj/item/device/laser_pointer, +/obj/item/laser_pointer, /turf/simulated/floor/carpet/magenta, /area/konyang_landing_zone/command_center/living) "Aj" = ( @@ -2067,7 +2067,7 @@ /obj/item/clothing/gloves/yellow, /obj/item/storage/box/lights/bulbs, /obj/item/storage/box/lights, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center/garage) "Bi" = ( @@ -2145,7 +2145,7 @@ /area/konyang_landing_zone/command_center/greenhouse) "BM" = ( /obj/machinery/shipsensors/weak, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_x = -23; name = "static GPS (Command Center)"; gpstag = "SCC-FOB" @@ -2756,7 +2756,7 @@ dir = 1 }, /obj/item/pen, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "IE" = ( @@ -2935,21 +2935,21 @@ /obj/item/stack/material/glass/full{ pixel_y = 9 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/ano_scanner{ +/obj/item/ano_scanner{ pixel_x = -5 }, -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "KU" = ( @@ -3640,8 +3640,8 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/camera, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera_film, /obj/item/tape_roll{ pixel_x = 14 }, @@ -3968,7 +3968,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center/living) "Ye" = ( @@ -4066,7 +4066,7 @@ /obj/item/clothing/accessory/armband/scc, /obj/item/flag/scc, /obj/item/flag/scc, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/carpet/purple, /area/konyang_landing_zone/command_center/living) "ZL" = ( diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm index 4526f328cd1..89158edc852 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -175,7 +175,7 @@ dir = 1 }, /obj/item/pen, -/obj/item/device/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "cb" = ( @@ -196,7 +196,7 @@ "ch" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 5 }, /turf/simulated/floor/carpet/magenta, @@ -516,11 +516,11 @@ /obj/effect/decal/road_marking/no_pass{ dir = 4 }, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining{ +/obj/item/gps/mining, +/obj/item/gps/mining{ pixel_x = -7 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 6 }, /obj/structure/table/rack, @@ -1469,8 +1469,8 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/camera, -/obj/item/device/camera_film, +/obj/item/camera, +/obj/item/camera_film, /obj/item/tape_roll{ pixel_x = 14 }, @@ -1528,7 +1528,7 @@ /obj/item/clothing/accessory/armband/scc, /obj/item/flag/scc, /obj/item/flag/scc, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/carpet/purple, /area/konyang_landing_zone/command_center/living) "uy" = ( @@ -1555,7 +1555,7 @@ /obj/item/clothing/gloves/yellow, /obj/item/storage/box/lights/bulbs, /obj/item/storage/box/lights, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center/garage) "vc" = ( @@ -1704,7 +1704,7 @@ }, /obj/machinery/recharger, /obj/structure/table/wood, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 8 }, /turf/simulated/floor/wood, @@ -2028,7 +2028,7 @@ /area/konyang_landing_zone) "BR" = ( /obj/structure/bed/stool/chair/sofa/left/red, -/obj/item/device/laser_pointer, +/obj/item/laser_pointer, /turf/simulated/floor/carpet/magenta, /area/konyang_landing_zone/command_center/living) "Ch" = ( @@ -2320,7 +2320,7 @@ /obj/item/wrench, /obj/machinery/light/small, /obj/item/clothing/gloves/yellow, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/item/extinguisher, /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center/reactor) @@ -2941,7 +2941,7 @@ /area/konyang_landing_zone/command_center/landing_pads) "PX" = ( /obj/machinery/shipsensors/weak, -/obj/item/device/gps/stationary{ +/obj/item/gps/stationary{ pixel_x = -23; name = "static GPS (Command Center)"; gpstag = "SCC-FOB" @@ -3090,21 +3090,21 @@ /obj/item/stack/material/glass/full{ pixel_y = 9 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/ano_scanner{ +/obj/item/ano_scanner{ pixel_x = -5 }, -/obj/item/device/measuring_tape, +/obj/item/measuring_tape, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "Ss" = ( @@ -3118,7 +3118,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center/living) "Sx" = ( diff --git a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm index 44b36a4e1be..ba788f14203 100644 --- a/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm @@ -662,9 +662,9 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/konyang_pirate_outpost) "HX" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/structure/closet/crate, /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, @@ -930,7 +930,7 @@ pixel_x = 1; pixel_y = 6 }, -/obj/item/device/radio, +/obj/item/radio, /turf/simulated/floor/wood, /area/konyang_pirate_outpost) "WP" = ( diff --git a/maps/random_ruins/exoplanets/konyang/stranded_police.dmm b/maps/random_ruins/exoplanets/konyang/stranded_police.dmm index 1d37ea947e2..21132adb65e 100644 --- a/maps/random_ruins/exoplanets/konyang/stranded_police.dmm +++ b/maps/random_ruins/exoplanets/konyang/stranded_police.dmm @@ -4,7 +4,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) "b" = ( -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) "c" = ( @@ -34,7 +34,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) "u" = ( -/obj/item/device/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/exoplanet/konyang, /area/exoplanet/grass/konyang) "w" = ( diff --git a/maps/random_ruins/exoplanets/konyang/swamp_2.dmm b/maps/random_ruins/exoplanets/konyang/swamp_2.dmm index 633173248bf..cd2cb1bbffd 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_2.dmm +++ b/maps/random_ruins/exoplanets/konyang/swamp_2.dmm @@ -16,7 +16,7 @@ }, /obj/effect/floor_decal/konyang_flowers, /obj/structure/bed/stool/wood, -/obj/item/device/synthesized_instrument/guitar/multi/fluff/akinyi_symphette{ +/obj/item/synthesized_instrument/guitar/multi/fluff/akinyi_symphette{ pixel_x = 16; pixel_y = 6 }, diff --git a/maps/random_ruins/exoplanets/konyang/swamp_3.dmm b/maps/random_ruins/exoplanets/konyang/swamp_3.dmm index 435b4f6f2a0..140680a92c9 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_3.dmm +++ b/maps/random_ruins/exoplanets/konyang/swamp_3.dmm @@ -563,7 +563,7 @@ pixel_x = -12; pixel_y = 6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 3; pixel_y = -7 }, diff --git a/maps/random_ruins/exoplanets/konyang/swamp_4.dmm b/maps/random_ruins/exoplanets/konyang/swamp_4.dmm index 957d4dcc35d..7585d6c10c6 100644 --- a/maps/random_ruins/exoplanets/konyang/swamp_4.dmm +++ b/maps/random_ruins/exoplanets/konyang/swamp_4.dmm @@ -239,7 +239,7 @@ /obj/structure/flora/stump/log{ pixel_y = -5 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_x = 2; pixel_y = 6 }, @@ -655,7 +655,7 @@ /area/exoplanet/grass/konyang) "YE" = ( /obj/structure/lattice/catwalk/indoor/planks, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_x = 6; pixel_y = 16 }, diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm index 4565e787e2e..5fe265614d0 100644 --- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm +++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dm @@ -52,7 +52,7 @@ shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/konyang/army l_pocket = /obj/item/storage/wallet/random - r_pocket = /obj/item/device/radio + r_pocket = /obj/item/radio back = /obj/item/storage/backpack/rucksack/green id = /obj/item/card/id/konyang_army diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm index c40913568ee..9351cde6b2d 100644 --- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm @@ -518,7 +518,7 @@ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ pixel_y = 10; pixel_x = -10 }, @@ -572,10 +572,10 @@ }, /obj/item/storage/box/large/flares, /obj/item/storage/box/large/flares, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/gps, +/obj/item/gps, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /turf/simulated/floor/exoplanet/tiled, /area/konyang_telecomms_outpost) "DG" = ( @@ -783,7 +783,7 @@ /obj/structure/table/steel, /obj/item/paper_bin, /obj/item/pen/black, -/obj/item/device/radio/phone{ +/obj/item/radio/phone{ pixel_y = 10; pixel_x = 10 }, @@ -803,7 +803,7 @@ /area/konyang_telecomms_outpost) "Qg" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -2; pixel_y = 6 }, diff --git a/maps/random_ruins/exoplanets/konyang/tribute.dmm b/maps/random_ruins/exoplanets/konyang/tribute.dmm index d319e9d26ba..95b9ecfcb9d 100644 --- a/maps/random_ruins/exoplanets/konyang/tribute.dmm +++ b/maps/random_ruins/exoplanets/konyang/tribute.dmm @@ -13,7 +13,7 @@ pixel_y = 25; density = 0 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 16; pixel_x = -1 }, @@ -267,7 +267,7 @@ /obj/structure/lattice/catwalk/indoor/tatami{ dir = 8 }, -/obj/item/device/versebook/trinary{ +/obj/item/versebook/trinary{ pixel_y = 7; pixel_x = -4 }, @@ -708,11 +708,11 @@ /obj/structure/lattice/catwalk/indoor/tatami{ dir = 4 }, -/obj/item/device/versebook/trinary{ +/obj/item/versebook/trinary{ pixel_y = 9; pixel_x = -7 }, -/obj/item/device/versebook/trinary{ +/obj/item/versebook/trinary{ pixel_y = 5; pixel_x = 7 }, @@ -989,7 +989,7 @@ pixel_y = 25; density = 0 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 15; pixel_x = -2 }, diff --git a/maps/random_ruins/exoplanets/konyang/village.dmm b/maps/random_ruins/exoplanets/konyang/village.dmm index afaaa583ac3..c8ef9b95e6d 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dmm +++ b/maps/random_ruins/exoplanets/konyang/village.dmm @@ -1458,7 +1458,7 @@ /area/konyang_village) "Nc" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/konyang_village) "Nf" = ( @@ -1798,7 +1798,7 @@ /obj/item/pen/black{ pixel_y = 13 }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ pixel_y = 1; pixel_x = -5 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm b/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm index a8e2b7d44af..68704635b5e 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm @@ -187,7 +187,7 @@ pixel_y = 9 }, /obj/item/reagent_containers/glass/rag, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/exoplanet/lino{ temperature = 303.15 }, @@ -1231,7 +1231,7 @@ /area/moghes_bar) "Lx" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/wood{ temperature = 303.15 }, @@ -1393,7 +1393,7 @@ /area/moghes_bar) "Qo" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, @@ -1467,7 +1467,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/exoplanet/lino{ temperature = 303.15 }, @@ -1672,7 +1672,7 @@ /area/moghes_bar) "ZN" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/wood{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm index 93b67f03c34..5e87900ca28 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm +++ b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm @@ -72,7 +72,7 @@ /obj/outfit/admin/moghes_diona name = "Diona Servant" uniform = /obj/item/clothing/under/gearharness - belt = /obj/item/device/flashlight/lantern + belt = /obj/item/flashlight/lantern back = /obj/item/storage/backpack/satchel/leather id = null l_ear = null @@ -95,7 +95,7 @@ suit = /obj/item/clothing/accessory/poncho/unathimantle/mountain id = /obj/item/card/id backpack_contents = list( - /obj/item/device/uv_light = 1 + /obj/item/uv_light = 1 ) r_pocket = /obj/item/storage/wallet diff --git a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm index 2576d56cd4c..c0ff2f622ef 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dmm @@ -168,10 +168,10 @@ /area/exoplanet/moghes) "oK" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/wood{ temperature = 303.15 }, @@ -186,7 +186,7 @@ /area/moghes_diona_traders) "pd" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 4 }, /obj/item/paper/fluff/moghes_diona_ad, @@ -439,9 +439,9 @@ /area/exoplanet/moghes) "Kb" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/wood{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm b/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm index 3f5835c916c..51a88c4d8fd 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_guild_mining.dmm @@ -172,10 +172,10 @@ /area/moghes_guild_mining) "ra" = ( /obj/structure/table/rack, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/machinery/light, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 @@ -272,10 +272,10 @@ /area/moghes_guild_mining) "wy" = ( /obj/structure/table/rack, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/machinery/light, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 @@ -314,10 +314,10 @@ /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_hegemony_base.dmm b/maps/random_ruins/exoplanets/moghes/moghes_hegemony_base.dmm index c717f30def5..832e9b11f17 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_hegemony_base.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_hegemony_base.dmm @@ -644,7 +644,7 @@ /area/moghes/hegemony_base) "ta" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/exoplanet/carpet/red, /area/moghes/hegemony_base) "tl" = ( @@ -749,7 +749,7 @@ /obj/item/clothing/under/unathi/izweski, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/accessory/poncho/red, -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, @@ -883,11 +883,11 @@ dir = 6 }, /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 @@ -1104,7 +1104,7 @@ pixel_y = 4; pixel_x = -5 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/storage/belt/medical, /obj/item/bodybag/cryobag, /turf/simulated/floor/exoplanet/tiled/white{ @@ -1294,7 +1294,7 @@ /obj/item/clothing/under/unathi/izweski, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/accessory/poncho/red, -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, /obj/item/toy/crossbow, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 @@ -1337,7 +1337,7 @@ /obj/item/clothing/under/unathi/izweski, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/accessory/poncho/red, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, @@ -1718,8 +1718,8 @@ /obj/item/storage/box/handcuffs, /obj/item/reagent_containers/spray/pepper, /obj/item/reagent_containers/spray/pepper, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, @@ -1817,7 +1817,7 @@ /obj/item/clothing/under/unathi/izweski, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/accessory/poncho/red, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_heph_mining.dmm b/maps/random_ruins/exoplanets/moghes/moghes_heph_mining.dmm index 3a4c4f202fe..eccb9cd0ecd 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_heph_mining.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_heph_mining.dmm @@ -65,7 +65,7 @@ /area/moghes_heph_mining) "gg" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, @@ -216,14 +216,14 @@ /area/moghes_heph_mining) "qV" = ( /obj/structure/table/steel, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, @@ -590,9 +590,9 @@ /area/moghes_heph_mining) "NL" = ( /obj/structure/table/steel, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, @@ -633,10 +633,10 @@ /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm b/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm index f9e2b0721f3..06f09b5b015 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dmm @@ -83,7 +83,7 @@ /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) "n" = ( -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/carpet/lightblue, /area/moghes/kataphract_wasteland/tent) "o" = ( @@ -91,9 +91,9 @@ /obj/item/saddle, /obj/item/clothing/suit/armor/unathi/hegemony, /obj/item/clothing/head/helmet/unathi/hegemony, -/obj/item/device/radio, -/obj/item/device/geiger, -/obj/item/device/gps, +/obj/item/radio, +/obj/item/geiger, +/obj/item/gps, /obj/item/gun/energy/pistol/hegemony, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) @@ -241,12 +241,12 @@ /area/moghes/kataphract_wasteland/tent) "N" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) "O" = ( /obj/random/dirt_75, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) "Q" = ( @@ -284,7 +284,7 @@ /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) "W" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes/kataphract_wasteland/tent) "X" = ( @@ -298,13 +298,13 @@ /obj/item/clothing/head/helmet/unathi/hegemony, /obj/item/clothing/head/helmet/unathi/hegemony, /obj/item/clothing/head/helmet/unathi/hegemony, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/gps, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/gps, /obj/item/gun/energy/pistol/hegemony, /obj/item/gun/energy/pistol/hegemony, /obj/item/gun/energy/pistol/hegemony, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_kung_fu.dmm b/maps/random_ruins/exoplanets/moghes/moghes_kung_fu.dmm index a9d3871c083..3314f01f2b7 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_kung_fu.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_kung_fu.dmm @@ -131,7 +131,7 @@ /area/template_noop) "Q" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/item/material/hatchet/unathiknife, /obj/item/reagent_containers/food/drinks/flask/vacuumflask, /obj/item/storage/box/fancy/med_pouch/trauma, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_ruined_base.dmm b/maps/random_ruins/exoplanets/moghes/moghes_ruined_base.dmm index 5223b65beea..3df0f9ff9b7 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_ruined_base.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_ruined_base.dmm @@ -149,7 +149,7 @@ /area/template_noop) "jO" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/exoplanet/carpet/red, /area/template_noop) "ms" = ( @@ -250,11 +250,11 @@ dir = 6 }, /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, @@ -677,8 +677,8 @@ /obj/machinery/light, /obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/table/steel, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/reagent_containers/hypospray{ pixel_y = 4; pixel_x = -5 diff --git a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm index 9992a4af28c..64e0430eca8 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm +++ b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm @@ -57,7 +57,7 @@ accessory_contents = list(/obj/item/gun/projectile/pistol/spitter = 1) backpack_contents = list( /obj/item/ammo_magazine/spitterpistol = 1, - /obj/item/device/versebook/siakh = 1, + /obj/item/versebook/siakh = 1, /obj/item/clothing/suit/armor/unathi = 1, /obj/item/clothing/head/helmet/unathi = 1 ) diff --git a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm index 18efda8b940..466873031af 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dmm @@ -183,10 +183,10 @@ /obj/item/ammo_casing/shotgun/moghes, /obj/item/ammo_casing/shotgun/moghes, /obj/item/clothing/accessory/storage/bandolier, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch, /turf/simulated/floor/exoplanet/foundation{ temperature = 315.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm b/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm index 8842a423e8c..1dc81f3d2fd 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_skakh.dmm @@ -151,15 +151,15 @@ /area/moghes_skakh) "sw" = ( /obj/structure/closet, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, +/obj/item/versebook/skakh, /turf/simulated/floor/exoplanet/carpet/red{ temperature = 303.15 }, @@ -300,7 +300,7 @@ /area/moghes_skakh) "DD" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/exoplanet/marble{ temperature = 303.15 }, @@ -386,7 +386,7 @@ /area/moghes_skakh) "Sy" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/exoplanet/carpet/red{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_thakh.dmm b/maps/random_ruins/exoplanets/moghes/moghes_thakh.dmm index f6e23cf4dbd..1ed2fd7a417 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_thakh.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_thakh.dmm @@ -215,7 +215,7 @@ }, /area/moghes_thakh) "Ir" = ( -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, /obj/structure/table/fancy/black, /turf/simulated/floor/exoplanet/wood/walnut{ temperature = 303.15 @@ -271,13 +271,13 @@ /area/moghes_thakh) "Ou" = ( /obj/structure/closet/cabinet, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/thakh, -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, +/obj/item/versebook/thakh, +/obj/item/versebook/thakh, +/obj/item/versebook/thakh, +/obj/item/versebook/thakh, +/obj/item/versebook/thakh, +/obj/item/versebook/thakh, /turf/simulated/floor/exoplanet/wood/walnut{ temperature = 303.15 }, @@ -369,7 +369,7 @@ /area/moghes_thakh) "Zn" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood/walnut{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm b/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm index 9870d94062a..07210b6325a 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm @@ -188,7 +188,7 @@ /area/moghes_village) "lh" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood/birch{ temperature = 303.15 }, @@ -371,7 +371,7 @@ /turf/simulated/floor/exoplanet/marble/dark, /area/moghes_village/shrine) "rL" = ( -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/structure/table/wood, /turf/simulated/floor/exoplanet/wood/birch{ temperature = 303.15 @@ -789,8 +789,8 @@ /area/moghes_village/indoors) "UJ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/grass/moghes/dirt, /area/moghes_village/indoors) "Wx" = ( diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm index cad4f84c1dd..b56eef78add 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dmm @@ -44,11 +44,11 @@ /turf/simulated/floor/exoplanet/carpet/darkblue, /area/moghes_dorviza/tent) "iX" = ( -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/carpet/red, /area/moghes_dorviza/tent) "jy" = ( -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/desert{ temperature = 315.15 }, @@ -64,9 +64,9 @@ /area/exoplanet/moghes) "lk" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/desert{ temperature = 315.15 }, @@ -100,7 +100,7 @@ }, /area/moghes_dorviza) "ob" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/desert{ temperature = 315.15 }, @@ -269,7 +269,7 @@ /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) "Eq" = ( -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) "EK" = ( @@ -292,7 +292,7 @@ }, /area/moghes_dorviza) "FS" = ( -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, /obj/item/lore_radio, /turf/simulated/floor/exoplanet/carpet/red, /area/moghes_dorviza/tent) @@ -313,7 +313,7 @@ "Jp" = ( /obj/structure/table/rack/cafe_table, /obj/item/storage/firstaid/surgery, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_dorviza/tent) "JL" = ( diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm index 84d78c88528..cab4ec4989c 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm @@ -21,11 +21,11 @@ dir = 6 }, /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 @@ -147,10 +147,10 @@ name = "footlocker" }, /obj/machinery/light/colored/decayed, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/head/unathi/deco/dark/blue, -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, /obj/item/clothing/accessory/poncho/red, /obj/item/clothing/accessory/poncho/red, /obj/item/clothing/accessory/poncho, @@ -208,7 +208,7 @@ name = "footlocker" }, /obj/machinery/light/colored/decayed, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/suit/unathi/robe/beige, /obj/item/clothing/under/unathi/mogazali/blue, @@ -425,7 +425,7 @@ pixel_y = 4; pixel_x = -5 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/storage/belt/medical, /obj/item/bodybag/cryobag, /turf/simulated/floor/exoplanet/tiled/white{ @@ -450,9 +450,9 @@ /obj/machinery/light/colored/decayed{ dir = 1 }, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/clothing/accessory/poncho/red, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/suit/unathi/robe/robe_coat, /turf/simulated/floor/exoplanet/concrete/square{ @@ -994,7 +994,7 @@ /area/moghes/hegemony_wasteland) "GG" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/exoplanet/carpet/red, /area/moghes/hegemony_wasteland) "Hb" = ( @@ -1014,7 +1014,7 @@ /obj/machinery/light/colored/decayed{ dir = 1 }, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/clothing/accessory/poncho/red, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/suit/unathi/robe/robe_coat/red, @@ -1062,9 +1062,9 @@ /obj/structure/closet/crate{ name = "footlocker" }, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/toy/plushie/xana, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/under/unathi/mogazali/green, /obj/item/clothing/accessory/poncho, @@ -1364,10 +1364,10 @@ /obj/structure/closet/crate{ name = "footlocker" }, -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/head/unathi/dark, -/obj/item/device/versebook/thakh, +/obj/item/versebook/thakh, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm index 6e76b848333..0602061da02 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm @@ -273,10 +273,10 @@ /area/moghes_klax) "ox" = ( /obj/structure/table/rack, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/gps, +/obj/item/gps, /turf/simulated/floor/exoplanet/tiled, /area/moghes_klax) "oE" = ( @@ -342,10 +342,10 @@ "se" = ( /obj/structure/table/standard, /obj/machinery/reagentgrinder, -/obj/item/device/reagent_scanner/adv{ +/obj/item/reagent_scanner/adv{ pixel_x = -8 }, -/obj/item/device/mass_spectrometer/adv, +/obj/item/mass_spectrometer/adv, /obj/effect/floor_decal/corner_wide/orange{ dir = 10 }, @@ -582,7 +582,7 @@ "EF" = ( /obj/structure/table/rack, /obj/item/storage/toolbox/mechanical, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/exoplanet/tiled, /area/moghes_klax) "EL" = ( @@ -727,7 +727,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 }, @@ -818,7 +818,7 @@ /area/moghes_klax) "Rn" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm index 594c3a6f68e..b0f5f05ab9e 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dmm @@ -124,8 +124,8 @@ /obj/item/saddle, /obj/item/saddle, /obj/item/saddle, -/obj/item/device/binoculars/spyglass, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/exoplanet/carpet/rubber{ temperature = 303.15 }, @@ -268,10 +268,10 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/device/synthesized_instrument/guitar, -/obj/item/device/synthesized_instrument/synthesizer, -/obj/item/device/synthesized_instrument/trumpet, -/obj/item/device/synthesized_instrument/violin, +/obj/item/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/synthesizer, +/obj/item/synthesized_instrument/trumpet, +/obj/item/synthesized_instrument/violin, /turf/simulated/floor/exoplanet/carpet/rubber{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm index 374ccba9dfd..2c1fb0dca61 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm @@ -15,7 +15,7 @@ req_access = list(227) }, /obj/structure/table/steel, -/obj/item/device/radio, +/obj/item/radio, /obj/machinery/light{ dir = 8 }, @@ -292,9 +292,9 @@ /obj/item/weldingtool/largetank, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/multitool, /turf/simulated/floor/exoplanet/tiled{ temperature = 315.15 }, @@ -329,10 +329,10 @@ /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialu, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /turf/simulated/floor/exoplanet/tiled{ temperature = 315.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm index 180e3e51c3f..565c71daec4 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm @@ -312,7 +312,7 @@ /obj/item/clothing/gloves/latex/unathi, /obj/item/clothing/mask/surgical/w, /obj/item/clothing/mask/surgical/w, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /obj/item/nullrod/shaman, /obj/item/cane/crutch, /obj/item/cane/crutch, @@ -329,11 +329,11 @@ /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/stethoscope, -/obj/item/device/flashlight/pen, -/obj/item/device/flashlight/pen, -/obj/item/device/breath_analyzer, -/obj/item/device/healthanalyzer, -/obj/item/device/healthanalyzer, +/obj/item/flashlight/pen, +/obj/item/flashlight/pen, +/obj/item/breath_analyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, /turf/simulated/floor/exoplanet/foundation{ temperature = 315.15 }, @@ -360,7 +360,7 @@ /obj/item/stack/medical/bruise_pack/full, /obj/item/stack/medical/bruise_pack/full, /obj/item/stack/medical/ointment/full, -/obj/item/device/breath_analyzer, +/obj/item/breath_analyzer, /turf/simulated/floor/exoplanet/foundation{ temperature = 315.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm index d17cd93f623..14734b8725d 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm @@ -72,7 +72,7 @@ /area/exoplanet/moghes) "i" = ( /obj/effect/floor_decal/spline/plain/brown, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/carpet/orange, /area/moghes_queendom) "k" = ( @@ -159,17 +159,17 @@ /area/moghes_queendom) "C" = ( /obj/structure/closet/crate, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/radio, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/radio, /obj/item/torch, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /obj/effect/floor_decal/spline/plain/blue{ dir = 1 }, @@ -277,7 +277,7 @@ }, /area/exoplanet/moghes) "V" = ( -/obj/item/device/flashlight/lantern/on, +/obj/item/flashlight/lantern/on, /turf/simulated/floor/exoplanet/desert{ temperature = 315.15 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimers.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimers.dmm index fe2b7eeec12..73885e3c678 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimers.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimers.dmm @@ -66,10 +66,10 @@ /obj/item/material/hatchet/machete/steel, /obj/item/clothing/accessory/holster/utility/machete, /obj/item/clothing/accessory/holster/utility/machete, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, -/obj/item/device/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, +/obj/item/geiger, /obj/item/gun/projectile/pistol/spitter, /obj/item/ammo_magazine/spitterpistol, /obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed/crackrifle, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm index 5eea7bb7ffc..7fedfe52fe2 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm @@ -331,7 +331,7 @@ dir = 1 }, /obj/structure/bed/stool/wood, -/obj/item/device/synthesized_instrument/guitar, +/obj/item/synthesized_instrument/guitar, /obj/effect/floor_decal/spline/plain/beige{ dir = 1 }, @@ -576,7 +576,7 @@ /area/exoplanet/moghes) "wQ" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box, +/obj/item/flashlight/lamp/box, /turf/simulated/floor/exoplanet/wood/birch{ temperature = 303.15 }, @@ -1213,7 +1213,7 @@ /obj/structure/closet/crate/weapon, /obj/item/material/twohanded/spear/plasteel, /obj/item/material/twohanded/spear/plasteel, -/obj/item/device/geiger, +/obj/item/geiger, /obj/effect/floor_decal/spline/plain/beige{ dir = 10 }, diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm index 05582535c6c..fbd6471214f 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm @@ -76,8 +76,8 @@ /area/exoplanet/moghes) "cL" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -479,7 +479,7 @@ /area/exoplanet/moghes) "uN" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood/birch{ temperature = 315.15 }, diff --git a/maps/random_ruins/exoplanets/new_gibson/gibson_mining.dmm b/maps/random_ruins/exoplanets/new_gibson/gibson_mining.dmm index 7bbf307a8b8..27641c436e2 100644 --- a/maps/random_ruins/exoplanets/new_gibson/gibson_mining.dmm +++ b/maps/random_ruins/exoplanets/new_gibson/gibson_mining.dmm @@ -69,7 +69,7 @@ }, /area/template_noop) "WK" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/permafrost{ temperature = 73.15 }, diff --git a/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm b/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm index ae41fbe59d1..8eb4e13f49c 100644 --- a/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm +++ b/maps/random_ruins/exoplanets/new_gibson/gibson_resupply.dmm @@ -337,8 +337,8 @@ "WK" = ( /obj/structure/closet/crate, /obj/item/storage/box/lights/mixed, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, /obj/random/powercell, /obj/random/tech_supply, /obj/random/tech_supply, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm index e65562a0bec..415519d578d 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm @@ -579,12 +579,12 @@ "QJ" = ( /obj/structure/table/stone/marble, /obj/item/flame/candle, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/autakh, -/obj/item/device/versebook/autakh, +/obj/item/versebook/autakh, +/obj/item/versebook/autakh, +/obj/item/versebook/autakh, +/obj/item/versebook/autakh, +/obj/item/versebook/autakh, +/obj/item/versebook/autakh, /turf/simulated/floor/exoplanet/marble, /area/ouerea_autakh) "SL" = ( diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm index 4beaf66463e..03927699604 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm @@ -169,7 +169,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /turf/simulated/floor/exoplanet/lino{ temperature = 298.15 }, @@ -745,7 +745,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/exoplanet/lino{ temperature = 298.15 }, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_farm.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_farm.dmm index bfcb880f55c..a3e0000d474 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_farm.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_farm.dmm @@ -369,12 +369,12 @@ /obj/item/material/hatchet, /obj/item/material/hatchet, /obj/item/material/hatchet, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/machinery/light{ dir = 8 }, @@ -474,9 +474,9 @@ /obj/item/material/minihoe, /obj/item/material/minihoe, /obj/item/material/minihoe, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled{ temperature = 298.15 }, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm index 2ec33695928..0c4d97a28f0 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm @@ -46,14 +46,14 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_y = 25 }, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, +/obj/item/flashlight/maglight, /obj/item/storage/box/tactical/flashbangs, /obj/item/storage/box/tactical/teargas, /obj/item/storage/box/handcuffs, @@ -431,7 +431,7 @@ /area/ouerea_freewater) "vj" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/item/toy/desk/newtoncradle{ pixel_y = 10 }, @@ -762,23 +762,23 @@ /obj/machinery/recharger{ pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 14; pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 14; pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 14; pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 14; pixel_x = -6 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_y = 14; pixel_x = -6 }, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm index b632d2e8f29..511893c3387 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_guild_mining.dmm @@ -168,10 +168,10 @@ /area/ouerea_guild_mining) "ps" = ( /obj/structure/table/rack, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/machinery/light, /turf/simulated/floor/exoplanet/concrete{ temperature = 298.15 @@ -279,10 +279,10 @@ /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/concrete{ temperature = 298.15 }, @@ -520,10 +520,10 @@ /area/ouerea_guild_mining) "SG" = ( /obj/structure/table/rack, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/machinery/light, /turf/simulated/floor/exoplanet/concrete{ temperature = 298.15 diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm index c4ae93c730d..ca667017950 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_hegemony_base.dmm @@ -256,7 +256,7 @@ /area/ouerea/ouerea_hegemony_base/outdoors) "gC" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /turf/simulated/floor/exoplanet/carpet/red, /area/ouerea/ouerea_hegemony_base) "gG" = ( @@ -458,8 +458,8 @@ /obj/item/storage/box/handcuffs, /obj/item/reagent_containers/spray/pepper, /obj/item/reagent_containers/spray/pepper, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, @@ -852,7 +852,7 @@ pixel_y = 4; pixel_x = -5 }, -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/item/storage/belt/medical, /obj/item/bodybag/cryobag, /turf/simulated/floor/exoplanet/tiled/white{ @@ -1617,11 +1617,11 @@ dir = 6 }, /obj/structure/table/rack, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 @@ -1721,7 +1721,7 @@ /area/ouerea/ouerea_hegemony_base) "Zb" = ( /obj/structure/table/steel, -/obj/item/device/versebook/skakh, +/obj/item/versebook/skakh, /turf/simulated/floor/exoplanet/concrete/square{ temperature = 303.15 }, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_heph_mining.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_heph_mining.dmm index 75afc4cc4b9..f939a00e65f 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_heph_mining.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_heph_mining.dmm @@ -217,10 +217,10 @@ /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, @@ -257,9 +257,9 @@ /area/ouerea_heph_mining) "ub" = ( /obj/structure/table/steel, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, @@ -279,14 +279,14 @@ /area/ouerea_heph_mining) "uN" = ( /obj/structure/table/steel, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /turf/simulated/floor/exoplanet/concrete{ temperature = 303.15 }, @@ -547,7 +547,7 @@ /area/ouerea_heph_mining) "Ji" = ( /obj/structure/table/wood, -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/item/storage/box/fancy/cigarettes/acmeco{ pixel_y = 16; pixel_x = 7 diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm index e648588253a..ccf257dd1bc 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_nt_ruin.dmm @@ -530,9 +530,9 @@ /obj/item/clothing/head/hazmat/research, /obj/item/clothing/under/rank/research_director, /obj/item/clothing/shoes/workboots/all_species, -/obj/item/device/flash, +/obj/item/flash, /obj/item/storage/box/firingpins, -/obj/item/device/pin_extractor, +/obj/item/pin_extractor, /obj/item/taperoll/science, /obj/item/storage/box/tethers, /obj/item/toy/plushie/pennyplush, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm index 238efb9ae06..6644c18a6fa 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm @@ -195,9 +195,9 @@ /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/device/camera, +/obj/item/camera, /obj/item/taperoll/science, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /obj/effect/floor_decal/corner/purple{ dir = 9 }, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm index 7c247e2a959..d2ef497ae73 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_sol_base.dmm @@ -61,7 +61,7 @@ /area/ouerea_sol) "ed" = ( /obj/structure/table/rack, -/obj/item/device/multitool, +/obj/item/multitool, /obj/effect/floor_decal/corner/orange{ dir = 6 }, diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm index d28dae3a73b..f76b4bc66f0 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm @@ -323,7 +323,7 @@ /area/ouerea_village) "wB" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/exoplanet/wood/birch{ temperature = 303.15 }, @@ -432,8 +432,8 @@ /area/ouerea_village) "Dc" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/exoplanet/barren{ temperature = 298.15 }, @@ -691,7 +691,7 @@ }, /area/ouerea_village) "SZ" = ( -/obj/item/device/radio/phone, +/obj/item/radio/phone, /obj/structure/table/wood, /turf/simulated/floor/exoplanet/wood/birch{ temperature = 303.15 diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index 57ac9244f3d..506eb5d21dd 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -858,11 +858,11 @@ }, /area/raskara_okon/observatory) "kL" = ( -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /obj/structure/table/standard, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -961,9 +961,9 @@ /area/raskara_okon/eva) "lq" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, +/obj/item/flashlight/heavy, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -1928,9 +1928,9 @@ /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -2742,7 +2742,7 @@ /area/raskara_okon/mining) "IO" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full{ dir = 1 }, @@ -2806,9 +2806,9 @@ }, /area/raskara_okon/observatory) "JO" = ( -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/structure/closet/toolcloset/empty, /obj/item/ore_detector, /obj/item/ore_detector, @@ -3002,7 +3002,7 @@ /area/raskara_okon/entry) "Mf" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full{ dir = 4 }, @@ -3573,7 +3573,7 @@ /area/raskara_okon/laboratory) "TS" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner/red/full, /turf/simulated/floor/tiled/dark{ temperature = 278.15 diff --git a/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm b/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm index f8126b8de0b..1d9b55875a5 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm @@ -14,7 +14,7 @@ /area/exoplanet/barren/raskara) "aX" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/airless, /area/exoplanet/barren/raskara) "br" = ( diff --git a/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm b/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm index 608827512a9..ec723ce912d 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/heph_mining_station.dmm @@ -708,18 +708,18 @@ req_access = null }, /obj/structure/table/rack, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/radio/hailing, +/obj/item/radio/hailing, +/obj/item/radio/hailing, +/obj/item/radio/hailing, /turf/simulated/floor/tiled/dark{ temperature = 303.15 }, @@ -2879,10 +2879,10 @@ /area/heph_mining_station/quarters) "SQ" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, diff --git a/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm b/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm index 50e87ba13fb..ec7f473f016 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/heph_survey_post.dmm @@ -296,10 +296,10 @@ icon_state = "heph_crate"; name = "equipment crate" }, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, /turf/simulated/floor/plating, /area/heph_survey_post) "nN" = ( @@ -474,7 +474,7 @@ icon_state = "heph_crate"; name = "equipment crate" }, -/obj/item/device/analyzer, +/obj/item/analyzer, /turf/simulated/floor/plating, /area/heph_survey_post) "uv" = ( @@ -923,8 +923,8 @@ icon_state = "heph_crate"; name = "equipment crate" }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/plating, /area/heph_survey_post) "Te" = ( diff --git a/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm b/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm index 936d1c2197b..b47413c17de 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/miners_guild_outpost.dmm @@ -10,10 +10,10 @@ /area/miners_guild_outpost/mining) "aw" = ( /obj/structure/table/rack, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, -/obj/item/device/radio/hailing, +/obj/item/radio/hailing, +/obj/item/radio/hailing, +/obj/item/radio/hailing, +/obj/item/radio/hailing, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel{ temperature = 303.15 @@ -1691,10 +1691,10 @@ /obj/item/ore_detector, /obj/item/ore_detector, /obj/item/ore_detector, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel{ temperature = 303.15 @@ -2206,14 +2206,14 @@ /area/miners_guild_outpost/mining) "QJ" = ( /obj/structure/table/rack, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/analyzer, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, -/obj/item/device/gps/mining, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/analyzer, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, +/obj/item/gps/mining, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel{ temperature = 303.15 diff --git a/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm b/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm index b404464e771..ab57ffb9c1a 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm +++ b/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dmm @@ -684,11 +684,11 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, +/obj/item/analyzer/plant_analyzer, /turf/simulated/floor/tiled, /area/pid_kois_farm) "DA" = ( @@ -971,8 +971,8 @@ dir = 6 }, /obj/structure/table/rack, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, /turf/simulated/floor/tiled, /area/pid_kois_farm) "VZ" = ( diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm index 1d518f095b3..bb48190fb8b 100644 --- a/maps/runtime/runtime.dmm +++ b/maps/runtime/runtime.dmm @@ -314,11 +314,11 @@ /turf/template_noop, /area/template_noop) "aO" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 5 }, /obj/structure/table/standard, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ name = "Common Channel" }, /turf/simulated/floor/plating, @@ -465,7 +465,7 @@ brightness_range = 16; must_start_working = 1 }, -/obj/item/device/analyzer, +/obj/item/analyzer, /obj/item/wrench, /obj/structure/table/standard, /turf/simulated/floor/plating, @@ -514,7 +514,7 @@ must_start_working = 1 }, /obj/item/storage/box/lights/mixed, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/structure/table/standard, /turf/simulated/floor/plating, /area/engineering) @@ -1132,7 +1132,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "cJ" = ( -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/effect/floor_decal/corner/dark_blue, /obj/effect/floor_decal/corner/white{ dir = 8 @@ -1307,7 +1307,7 @@ /turf/simulated/floor/tiled, /area/construction) "dk" = ( -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 5 }, /obj/structure/table/standard, @@ -1392,7 +1392,7 @@ /turf/simulated/floor/tiled, /area/construction) "dz" = ( -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/construction) @@ -1462,7 +1462,7 @@ /turf/simulated/floor/plating, /area/construction) "es" = ( -/obj/item/device/radio/intercom/locked/west{ +/obj/item/radio/intercom/locked/west{ frequency = 1343; locked_frequency = 1343; name = "Private AI Channel"; @@ -1492,7 +1492,7 @@ /area/turret_protected/ai_upload_foyer) "eH" = ( /obj/machinery/vending/medical, -/obj/item/device/advanced_healthanalyzer, +/obj/item/advanced_healthanalyzer, /turf/simulated/floor/tiled, /area/construction/storage) "eI" = ( @@ -1500,7 +1500,7 @@ c_tag = "Central Corridor 1"; dir = 1 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "eY" = ( @@ -2292,11 +2292,11 @@ icon_state = "0-8" }, /obj/effect/decal/warning_stripes, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ name = "Common Channel"; pixel_y = -3 }, -/obj/item/device/radio/intercom/south{ +/obj/item/radio/intercom/south{ frequency = 1343; name = "Private Channel" }, @@ -2554,7 +2554,7 @@ /turf/simulated/floor/plating, /area/storage/primary) "xz" = ( -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/stack/packageWrap, /turf/simulated/floor/tiled, /area/construction/storage) @@ -2712,7 +2712,7 @@ c_tag = "Central Corridor 2"; dir = 1 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "zQ" = ( @@ -3446,7 +3446,7 @@ c_tag = "AI Access"; dir = 1 }, -/obj/item/device/radio/intercom/south{ +/obj/item/radio/intercom/south{ frequency = 1343; name = "Private Channel" }, @@ -3538,7 +3538,7 @@ c_tag = "Bridge"; dir = 1 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled, /area/bridge) "RN" = ( diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index b81563d26a7..b166bd556f6 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -245,7 +245,7 @@ /turf/simulated/floor/carpet/art, /area/horizon/crew/lounge) "abC" = ( -/obj/item/device/healthanalyzer, +/obj/item/healthanalyzer, /obj/effect/floor_decal/corner/mauve/diagonal, /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -977,7 +977,7 @@ }, /obj/structure/table/rack, /obj/item/storage/box/samplebags, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/storage/box/gloves, /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -1077,7 +1077,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ pixel_y = -2 }, /turf/simulated/floor/tiled/white, @@ -1590,7 +1590,7 @@ /turf/simulated/floor/grass/no_edge, /area/horizon/rnd/hallway/secondary) "aii" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/structure/table/rack/retail_shelf, /turf/simulated/floor/tiled/full, /area/horizon/operations/commissary) @@ -1837,27 +1837,27 @@ /area/horizon/maintenance/deck_2/wing/port/far) "ajY" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 11; pixel_y = 4 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 7; pixel_y = 4 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_x = 3; pixel_y = 4 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 4; pixel_x = -9 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 4; pixel_x = -5 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 4; pixel_x = -1 }, @@ -2478,7 +2478,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) "aoi" = ( -/obj/item/device/camera, +/obj/item/camera, /obj/effect/floor_decal/corner/blue/diagonal, /turf/unsimulated/floor{ icon_state = "white" @@ -2687,10 +2687,10 @@ /obj/item/storage/toolbox/electrical{ pixel_y = 4 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 4 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -4 }, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3501,7 +3501,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_1/main/port) "auZ" = ( -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = 1 }, /obj/effect/floor_decal/industrial/outline/medical, @@ -4160,7 +4160,7 @@ /area/horizon/exterior) "ayL" = ( /obj/effect/floor_decal/corner/dark_green/full, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/structure/bed/stool/chair/office/light{ dir = 4 }, @@ -4197,7 +4197,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "azo" = ( @@ -4843,7 +4843,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/shuttle/dark_blue, /area/horizon/shuttle/escape_pod/pod3) "aDT" = ( @@ -5043,11 +5043,11 @@ pixel_y = 2; pixel_x = -1 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 5; pixel_y = 1 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = -7; pixel_y = -5 }, @@ -6114,7 +6114,7 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "aMm" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/holofloor/desert{ name = "dirt" }, @@ -6280,7 +6280,7 @@ dir = 8 }, /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -6391,7 +6391,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = 36 }, /obj/machinery/keycard_auth{ @@ -6446,31 +6446,31 @@ /obj/item/storage/firstaid/empty{ pixel_x = 7 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = 8 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = 8 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = 8 }, -/obj/item/device/assembly/prox_sensor{ +/obj/item/assembly/prox_sensor{ pixel_x = 8 }, -/obj/item/device/flash/synthetic{ +/obj/item/flash/synthetic{ pixel_x = -5; pixel_y = 6 }, -/obj/item/device/flash/synthetic{ +/obj/item/flash/synthetic{ pixel_x = -3; pixel_y = 6 }, -/obj/item/device/flash/synthetic{ +/obj/item/flash/synthetic{ pixel_x = -3; pixel_y = 2 }, -/obj/item/device/flash/synthetic{ +/obj/item/flash/synthetic{ pixel_x = -5; pixel_y = 2 }, @@ -6938,7 +6938,7 @@ /turf/simulated/open, /area/horizon/hallway/primary/deck_2/central) "aRW" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /obj/item/pickaxe, /obj/effect/decal/fake_object/light_source/invisible{ light_color = "#C48A18"; @@ -7025,10 +7025,10 @@ /area/horizon/maintenance/deck_1/hangar/port) "aSE" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /obj/machinery/light{ dir = 8 }, @@ -7206,12 +7206,12 @@ pixel_y = 8 }, /obj/structure/table/rack, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, +/obj/item/spaceflare, /turf/simulated/floor/tiled/dark, /area/horizon/hangar/control) "aTR" = ( @@ -8297,12 +8297,12 @@ /turf/simulated/floor/wood, /area/horizon/hallway/primary/deck_1/central) "bbv" = ( -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, -/obj/item/device/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, +/obj/item/magnetic_lock, /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ @@ -8814,11 +8814,11 @@ }, /obj/structure/table/steel, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_y = 4 }, -/obj/item/device/healthanalyzer, -/obj/item/device/analyzer/plant_analyzer{ +/obj/item/healthanalyzer, +/obj/item/analyzer/plant_analyzer{ pixel_y = -4 }, /turf/simulated/floor/tiled/dark, @@ -9069,7 +9069,7 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "bgH" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/vending/mredispenser/low_supply, /turf/simulated/floor/tiled/full, @@ -9538,9 +9538,9 @@ /area/antag/mercenary) "bjb" = ( /obj/structure/closet/secure_closet/merchant, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /obj/structure/window/reinforced{ dir = 4 }, @@ -10247,7 +10247,7 @@ dir = 8 }, /obj/structure/table/stone/marble, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /turf/simulated/floor/marble, /area/horizon/holodeck/source_tribunal) "bof" = ( @@ -10482,7 +10482,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/medical/hallway/upper) "boS" = ( -/obj/item/device/gps/stationary/mining_shuttle{ +/obj/item/gps/stationary/mining_shuttle{ pixel_x = -22; pixel_y = -8 }, @@ -10497,7 +10497,7 @@ pixel_x = -6; pixel_y = 7 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 8; pixel_y = 3 }, @@ -10799,7 +10799,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "bqZ" = ( @@ -10928,7 +10928,7 @@ /turf/simulated/floor/reinforced/reactor, /area/horizon/engineering/reactor/supermatter/mainchamber) "brM" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11772,7 +11772,7 @@ /obj/machinery/atmospherics/binary/pump/fuel{ name = "Fuel Tank to Thrusters" }, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = 6 }, /obj/effect/floor_decal/corner/dark_blue/full{ @@ -12134,11 +12134,11 @@ /area/centcom/legion) "bBh" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 9 }, /turf/simulated/floor/holofloor/snow, @@ -12366,7 +12366,7 @@ pixel_x = 9; pixel_y = 4 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/hydroponics/lower) "bCu" = ( @@ -12829,7 +12829,7 @@ /area/horizon/maintenance/deck_1/operations/starboard) "bGN" = ( /obj/effect/decal/rolling_fog, -/obj/item/device/flashlight/lamp/holodeck{ +/obj/item/flashlight/lamp/holodeck{ light_color = "#C48A18"; light_power = 2; light_range = 14; @@ -13338,7 +13338,7 @@ "bKB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/westright, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table/reinforced/steel, /turf/unsimulated/floor{ dir = 8 @@ -14887,7 +14887,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/item/device/flash, +/obj/item/flash, /obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/horizon/security/checkpoint2) @@ -14943,7 +14943,7 @@ dir = 1 }, /obj/machinery/disposal/small/west, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_y = 1 }, /turf/simulated/floor/tiled, @@ -14960,10 +14960,10 @@ /obj/structure/closet/crate/secure/legion, /obj/item/storage/box/handcuffs, /obj/item/storage/box/handcuffs, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, /obj/item/storage/box/tactical/teargas, /turf/unsimulated/floor, /area/centcom/legion) @@ -15060,8 +15060,8 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos/turbine) "bWM" = ( -/obj/item/device/paicard, -/obj/item/device/paicard, +/obj/item/paicard, +/obj/item/paicard, /obj/machinery/light{ dir = 8 }, @@ -15331,7 +15331,7 @@ opened = 1 }, /obj/item/trash/koisbar, -/obj/item/device/paicard, +/obj/item/paicard, /obj/random/junk, /turf/unsimulated/floor{ dir = 8; @@ -15581,8 +15581,8 @@ /area/horizon/crew/chargebay) "cbh" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/device/taperecorder, -/obj/item/device/megaphone/red, +/obj/item/taperecorder, +/obj/item/megaphone/red, /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/corner/grey{ dir = 5 @@ -16473,7 +16473,7 @@ c_tag = "Operations - Upper Warehouse Port"; dir = 8 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner/brown/full{ dir = 1 }, @@ -16615,7 +16615,7 @@ /turf/unsimulated/floor/monotile, /area/antag/mercenary) "chZ" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/effect/floor_decal/corner/purple/full{ dir = 4 }, @@ -16718,7 +16718,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/wood, /area/horizon/service/chapel/main) "ciT" = ( @@ -16900,7 +16900,7 @@ /area/horizon/engineering/reactor/indra/mainchamber) "ckm" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 5; pixel_y = 10 }, @@ -17129,7 +17129,7 @@ dir = 10 }, /obj/structure/window/reinforced, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/machinery/camera/network/third_deck{ c_tag = "Third Deck - Holodeck Beta 1"; dir = 8 @@ -17457,10 +17457,10 @@ /area/horizon/rnd/xenobiology/xenoflora) "cpe" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/rig_module/cooling_unit, /obj/item/rig_module/cooling_unit, /turf/unsimulated/floor, @@ -17588,7 +17588,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/structure/table/reinforced/steel, /obj/item/folder/blue{ pixel_y = 7; @@ -17863,7 +17863,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner_wide/green/full{ dir = 4 }, @@ -18089,7 +18089,7 @@ /obj/effect/floor_decal/corner/purple/full{ dir = 1 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -18332,14 +18332,14 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/structure/closet/crate/drop/grey{ desc = "A large, sturdy crate, that stores grenade components."; name = "grenade crate"; @@ -18734,7 +18734,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ pixel_y = 36 }, /obj/machinery/keycard_auth{ @@ -19816,8 +19816,8 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/jetpack/carbondioxide, /obj/item/tank/jetpack/carbondioxide, /turf/simulated/floor/tiled/white, @@ -21038,7 +21038,7 @@ /obj/structure/table/glass{ table_reinf = "glass" }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -21444,7 +21444,7 @@ /area/horizon/maintenance/deck_2/wing/starboard/far) "cQA" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 4 }, /turf/simulated/floor/holofloor/lino, @@ -21520,35 +21520,35 @@ /obj/effect/floor_decal/corner/mauve{ dir = 5 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = 6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = 6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = 6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = 6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = -6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = -6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = -6 }, -/obj/item/device/radio/sci{ +/obj/item/radio/sci{ pixel_y = 12; pixel_x = -6 }, @@ -21614,7 +21614,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Auxiliary Custodial Closet Entrance"; dir = 1 @@ -22375,10 +22375,10 @@ /obj/structure/window/reinforced/crescent{ dir = 8 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_y = 2 }, -/obj/item/device/laser_pointer/red{ +/obj/item/laser_pointer/red{ pixel_y = 3 }, /obj/structure/table/wood{ @@ -22642,7 +22642,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled, /area/horizon/security/brig) "cXQ" = ( @@ -22737,14 +22737,14 @@ /obj/structure/closet/secure_closet/evidence{ name = "closet" }, -/obj/item/device/camera_film, -/obj/item/device/camera{ +/obj/item/camera_film, +/obj/item/camera{ desc = "A one use - polaroid camera. 30 photos left."; name = "detectives camera"; pictures_left = 30 }, /obj/item/storage/slide_projector, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_y = 5 }, /turf/simulated/floor/lino, @@ -22994,27 +22994,27 @@ req_one_access = list(24,11,67,73) }, /obj/structure/table/stone/marble, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -8; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -8; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -8; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -8; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -8; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -8; pixel_y = 5 }, @@ -23418,7 +23418,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/transport1) "dcM" = ( -/obj/item/device/radio/intercom/interrogation/north{ +/obj/item/radio/intercom/interrogation/north{ dir = 8; pixel_y = 10; pixel_x = -5 @@ -23584,7 +23584,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24589,7 +24589,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/security, -/obj/item/device/radio/intercom/expedition/west, +/obj/item/radio/intercom/expedition/west, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/flight_deck) "djZ" = ( @@ -24780,7 +24780,7 @@ }, /area/centcom/holding) "dlj" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, @@ -25221,7 +25221,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/spline/plain/black{ dir = 5 }, @@ -25311,7 +25311,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/teleport/pad, /obj/effect/floor_decal/spline/plain/cee{ dir = 1 @@ -25760,7 +25760,7 @@ "dqM" = ( /obj/effect/floor_decal/corner/pink/diagonal, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 6 }, @@ -25869,7 +25869,7 @@ /obj/machinery/recharger, /obj/structure/table/standard, /obj/structure/railing/mapped, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = 8; pixel_x = 14 }, @@ -27555,7 +27555,7 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ pixel_x = 10; pixel_y = 5 }, @@ -28104,7 +28104,7 @@ name = "Scrubbers to Waste"; target_pressure = 15000 }, -/obj/item/device/radio/intercom/expedition/east, +/obj/item/radio/intercom/expedition/east, /turf/simulated/floor/tiled/dark, /area/horizon/shuttle/intrepid/engineering) "dFZ" = ( @@ -28337,14 +28337,14 @@ }, /area/centcom/distress_prep) "dHF" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 3; pixel_y = 3 }, /obj/item/storage/briefcase, -/obj/item/device/flash, +/obj/item/flash, /obj/item/storage/secure/briefcase, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Internal Affairs EFTPOS scanner" }, /obj/item/clothing/under/suit_jacket/really_black, @@ -28353,11 +28353,11 @@ /obj/item/clipboard, /obj/item/pen/multi, /obj/structure/closet/lawcloset, -/obj/item/device/camera, +/obj/item/camera, /obj/item/stamp/denied, /obj/item/folder/blue, /obj/item/folder/white, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/stack/packageWrap, /turf/simulated/floor/carpet, /area/horizon/repoffice/representative_two) @@ -28833,7 +28833,7 @@ /area/horizon/engineering/hallway/fore) "dLi" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, @@ -29087,7 +29087,7 @@ /turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/port_compartment) "dNF" = ( -/obj/item/device/megaphone/red{ +/obj/item/megaphone/red{ pixel_x = 1; pixel_y = 4 }, @@ -29785,7 +29785,7 @@ /turf/space, /area/template_noop) "dSv" = ( -/obj/item/device/laser_pointer/blue{ +/obj/item/laser_pointer/blue{ pixel_x = -12; pixel_y = 5 }, @@ -30303,7 +30303,7 @@ "dWF" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled/full, /area/horizon/engineering/lobby) "dWI" = ( @@ -30527,7 +30527,7 @@ /obj/effect/floor_decal/industrial/outline/medical, /obj/structure/bed/padded, /obj/item/bedsheet/medical, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled/white, /area/horizon/medical/ward) "dYm" = ( @@ -30582,7 +30582,7 @@ pixel_y = -6 }, /obj/item/paper_bin, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/key/janicart, /obj/effect/floor_decal/corner/purple{ dir = 9 @@ -30964,35 +30964,35 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = 6; pixel_y = 12 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = -6; pixel_y = 12 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = -6; pixel_y = 12 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = 6; pixel_y = 12 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = 6; pixel_y = 6 }, @@ -31176,7 +31176,7 @@ /turf/simulated/floor/tiled/white, /area/shuttle/hapt) "ecx" = ( -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/structure/table/reinforced/steel, /turf/unsimulated/floor{ icon_state = "wood" @@ -33692,7 +33692,7 @@ /turf/simulated/floor/tiled, /area/horizon/service/hydroponics) "etZ" = ( -/obj/item/device/radio/intercom/north{ +/obj/item/radio/intercom/north{ broadcasting = 1; frequency = 1443; listening = 0; @@ -34346,7 +34346,7 @@ "eyA" = ( /obj/machinery/porta_turret, /obj/effect/floor_decal/industrial/warning/full, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled/dark, /area/horizon/ai/upload_foyer) "eyB" = ( @@ -34585,7 +34585,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 1 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/carpet/rubber, /area/horizon/tcommsat/chamber) "eAm" = ( @@ -35618,7 +35618,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -35646,7 +35646,7 @@ dir = 10 }, /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/storage/toolbox/mechanical, /obj/item/storage/belt/utility, /obj/item/stack/rods/full{ @@ -35806,7 +35806,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 9 }, -/obj/item/device/binoculars/spyglass, +/obj/item/binoculars/spyglass, /turf/simulated/floor/exoplanet/barren, /area/centcom/shared_dream) "eIx" = ( @@ -36138,7 +36138,7 @@ /obj/structure/table/glass{ table_reinf = "glass" }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/effect/floor_decal/corner_wide/paleblue/full{ dir = 1 }, @@ -36904,11 +36904,11 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, /obj/item/storage/toolbox/mechanical, -/obj/item/device/flashlight/flare/glowstick/random, -/obj/item/device/flashlight/flare/glowstick/random, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/multitool, +/obj/item/flashlight/flare/glowstick/random, +/obj/item/flashlight/flare/glowstick/random, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/multitool, /turf/simulated/floor, /area/horizon/command/bridge/aibunker) "eRO" = ( @@ -37810,7 +37810,7 @@ pixel_y = -19; pixel_x = -6 }, -/obj/item/device/radio/intercom/south{ +/obj/item/radio/intercom/south{ pixel_x = 14 }, /turf/simulated/floor/wood, @@ -38640,7 +38640,7 @@ /obj/effect/floor_decal/industrial/outline/service, /obj/structure/table/rack, /obj/item/storage/toolbox/mechanical, -/obj/item/device/t_scanner, +/obj/item/t_scanner, /obj/structure/noticeboard{ pixel_y = 30 }, @@ -38781,7 +38781,7 @@ pixel_x = -8; pixel_y = 10 }, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Research EFTPOS scanner" }, /obj/machinery/light/floor{ @@ -39804,7 +39804,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/mainchamber) "fme" = ( -/obj/item/device/flashlight/lamp/off{ +/obj/item/flashlight/lamp/off{ pixel_x = -5; pixel_y = 5 }, @@ -40543,25 +40543,25 @@ /area/horizon/shuttle/escape_pod/pod3) "fqW" = ( /obj/structure/table/rack, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, -/obj/item/device/radio/sec{ +/obj/item/radio/sec{ pixel_x = -7 }, /obj/item/crowbar/red{ @@ -40588,25 +40588,25 @@ pixel_x = 1; pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7 }, -/obj/item/device/flashlight/maglight{ +/obj/item/flashlight/maglight{ pixel_y = -7 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 7; pixel_y = 10 }, @@ -40896,7 +40896,7 @@ /obj/item/autopsy_scanner{ pixel_x = -11 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = 10 }, /turf/simulated/floor/tiled/dark, @@ -41276,7 +41276,7 @@ pixel_x = 2; pixel_y = 13 }, -/obj/item/device/t_scanner{ +/obj/item/t_scanner{ pixel_x = -4; pixel_y = 5 }, @@ -42023,7 +42023,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/tiled, /area/horizon/security/checkpoint2) "fDq" = ( @@ -42341,7 +42341,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/device/paicard, +/obj/item/paicard, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -42457,9 +42457,9 @@ pixel_x = 1; pixel_y = 2 }, -/obj/item/device/camera, -/obj/item/device/megaphone/sec, -/obj/item/device/megaphone/sec, +/obj/item/camera, +/obj/item/megaphone/sec, +/obj/item/megaphone/sec, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -43170,7 +43170,7 @@ /area/horizon/maintenance/deck_1/medical/cryo) "fLH" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/multitool, +/obj/item/multitool, /obj/structure/fireaxecabinet/west, /turf/unsimulated/floor, /area/centcom/legion/hangar5) @@ -44320,10 +44320,10 @@ /area/horizon/engineering/hallway/interior) "fTt" = ( /obj/structure/table/standard, -/obj/item/device/mmi{ +/obj/item/mmi{ pixel_y = 4 }, -/obj/item/device/mmi{ +/obj/item/mmi{ pixel_y = 11 }, /turf/simulated/floor/tiled, @@ -44699,7 +44699,7 @@ pixel_x = 7; pixel_y = 8 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -2; pixel_y = 3 }, @@ -44707,7 +44707,7 @@ pixel_x = 7; pixel_y = 1 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) "fVE" = ( @@ -44828,7 +44828,7 @@ pixel_x = -3; pixel_y = 12 }, -/obj/item/device/megaphone/red{ +/obj/item/megaphone/red{ pixel_y = -4 }, /obj/structure/table/standard, @@ -44993,7 +44993,7 @@ pixel_x = -7 }, /obj/structure/table/reinforced/steel, -/obj/item/device/quikpay{ +/obj/item/quikpay{ pixel_y = 1; pixel_x = 7 }, @@ -46160,7 +46160,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "ggn" = ( @@ -46413,11 +46413,11 @@ pixel_x = 6; pixel_y = 7 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -3; pixel_y = -3 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 3; pixel_y = -2 }, @@ -46885,7 +46885,7 @@ c_tag = "Bridge - Cockpit"; dir = 4 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = 3; pixel_y = 15 }, @@ -46933,7 +46933,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/disposal/small/east, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -46996,7 +46996,7 @@ dir = 6 }, /obj/machinery/recharger, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/structure/table/reinforced/steel, /turf/simulated/floor/carpet/rubber, /area/horizon/command/bridge/controlroom) @@ -47306,7 +47306,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled, /area/horizon/security/brig) "goM" = ( @@ -47790,7 +47790,7 @@ pixel_x = 6; pixel_y = 20 }, -/obj/item/device/mass_spectrometer/adv{ +/obj/item/mass_spectrometer/adv{ pixel_y = 20; pixel_x = -8 }, @@ -48214,7 +48214,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, -/obj/item/device/paicard, +/obj/item/paicard, /obj/item/tape_roll{ pixel_y = 10 }, @@ -49136,8 +49136,8 @@ }, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/cratescanner, -/obj/item/device/hand_labeler, +/obj/item/cratescanner, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/gunmetal/full, /area/horizon/operations/warehouse) "gAF" = ( @@ -49493,7 +49493,7 @@ /obj/item/pen{ pixel_y = 16 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 2 }, /obj/structure/table/wood{ @@ -50137,7 +50137,7 @@ /obj/item/shield/energy/legion, /obj/item/melee/energy/sword/knife, /obj/item/melee/telebaton, -/obj/item/device/megaphone/sec, +/obj/item/megaphone/sec, /obj/item/storage/box/fancy/cigarettes/cigar, /obj/item/flame/lighter/zippo, /obj/item/reagent_containers/food/drinks/bottle/victorygin, @@ -50407,10 +50407,10 @@ /obj/item/clothing/suit/trinary_robes{ pixel_x = 17 }, -/obj/item/device/versebook/trinary, -/obj/item/device/versebook/trinary, -/obj/item/device/versebook/trinary, -/obj/item/device/versebook/trinary, +/obj/item/versebook/trinary, +/obj/item/versebook/trinary, +/obj/item/versebook/trinary, +/obj/item/versebook/trinary, /turf/simulated/floor/bluegrid, /area/horizon/holodeck/source_trinary) "gJk" = ( @@ -50976,7 +50976,7 @@ pixel_y = 2; pixel_x = -12 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/item/material/ashtray/glass{ pixel_x = -8; pixel_y = 9 @@ -51074,7 +51074,7 @@ "gNI" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -4; pixel_y = 11 }, @@ -51602,7 +51602,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ on = 0 }, /obj/structure/table/standard, @@ -51668,8 +51668,8 @@ /obj/structure/table/rack/retail_shelf{ name = "storage shelf" }, -/obj/item/device/camera, -/obj/item/device/camera, +/obj/item/camera, +/obj/item/camera, /obj/effect/floor_decal/corner/mauve{ dir = 9 }, @@ -51829,7 +51829,7 @@ /area/centcom/evac) "gTL" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_y = 4 }, /turf/simulated/floor/carpet, @@ -51953,7 +51953,7 @@ "gUM" = ( /obj/structure/table/standard, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/recharger{ pixel_y = 9; pixel_x = 7 @@ -52330,7 +52330,7 @@ "gXd" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/reinforced/steel, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 3; pixel_y = 6 }, @@ -52434,10 +52434,10 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark/full, /area/horizon/storage/eva) "gXR" = ( @@ -52818,7 +52818,7 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/structure/table/steel, /obj/item/storage/box/fancy/donut, /turf/simulated/floor/tiled/dark, @@ -53040,7 +53040,7 @@ /obj/machinery/iv_drip, /obj/item/clothing/mask/breath/medical, /obj/item/tank/oxygen, -/obj/item/device/radio/intercom/expedition/east, +/obj/item/radio/intercom/expedition/east, /turf/simulated/floor/tiled/white, /area/horizon/shuttle/intrepid/medical) "hbV" = ( @@ -53147,8 +53147,8 @@ /obj/item/clothing/gloves/yellow, /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark/full, @@ -53463,7 +53463,7 @@ req_access = list(1) }, /obj/effect/floor_decal/industrial/outline/security, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/item/ammo_magazine/c45m/practice{ pixel_x = 4 }, @@ -54198,12 +54198,12 @@ dir = 9 }, /obj/structure/table/steel, -/obj/item/device/camera, -/obj/item/device/camera, -/obj/item/device/camera{ +/obj/item/camera, +/obj/item/camera, +/obj/item/camera{ pixel_y = 4 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_y = 4 }, /turf/simulated/floor/tiled/dark, @@ -54227,7 +54227,7 @@ }, /obj/effect/floor_decal/industrial/outline/security, /obj/structure/closet/secure_closet/warden, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Brig EFTPOS scanner" }, /obj/item/stamp/warden, @@ -54643,7 +54643,7 @@ /obj/structure/table/standard, /obj/machinery/cell_charger, /obj/item/paper_scanner, -/obj/item/device/paicard, +/obj/item/paicard, /turf/simulated/floor/tiled, /area/horizon/storage/primary) "hmK" = ( @@ -54837,15 +54837,15 @@ dir = 5 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 10; pixel_y = 2 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 10; pixel_y = 2 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 10; pixel_y = 2 }, @@ -55128,18 +55128,18 @@ /obj/machinery/requests_console/east{ department = "Paramedic Bay" }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = -6; pixel_y = 6 }, -/obj/item/device/radio/med{ +/obj/item/radio/med{ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = -7 }, -/obj/item/device/gps/medical{ +/obj/item/gps/medical{ pixel_x = 5 }, /obj/structure/table/reinforced/steel, @@ -55947,13 +55947,13 @@ pixel_x = -32 }, /obj/structure/table/reinforced/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/storage/bag/inflatable, /obj/item/storage/bag/inflatable, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/industrial/outline/operations, /obj/item/crowbar/hydraulic_rescue_tool, /turf/simulated/floor/carpet/rubber, @@ -56582,7 +56582,7 @@ pixel_x = -1; pixel_y = 14 }, -/obj/item/device/healthanalyzer{ +/obj/item/healthanalyzer{ pixel_x = -3; pixel_y = 2 }, @@ -58173,8 +58173,8 @@ /area/shuttle/merchant) "hJU" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark/full, /area/shuttle/skipjack) "hJV" = ( @@ -58529,7 +58529,7 @@ pixel_x = -40; pixel_y = 25 }, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ name = "Common Channel"; pixel_y = 18; dir = 1; @@ -58950,7 +58950,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, @@ -59210,7 +59210,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -2; pixel_y = 6 }, @@ -60856,7 +60856,7 @@ /obj/machinery/sleeper{ dir = 8 }, -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ frequency = 1213; name = "Intercom"; subspace_transmission = 1; @@ -61019,7 +61019,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "idT" = ( @@ -61715,22 +61715,22 @@ pixel_y = 10; pixel_x = 2 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 3 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 12 }, -/obj/item/device/gps{ +/obj/item/gps{ pixel_x = -6 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 3 }, -/obj/item/device/gps/mining{ +/obj/item/gps/mining{ pixel_x = 12 }, /turf/simulated/floor/plating, @@ -62168,7 +62168,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/simulated/floor/tiled/white, /area/horizon/rnd/test_range) "ima" = ( @@ -63304,11 +63304,11 @@ /obj/item/reagent_containers/glass/beaker{ pixel_y = 8 }, -/obj/item/device/slime_scanner{ +/obj/item/slime_scanner{ pixel_x = -11; pixel_y = 4 }, -/obj/item/device/slime_scanner{ +/obj/item/slime_scanner{ pixel_x = -11; pixel_y = 4 }, @@ -63518,7 +63518,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/ringer/west{ department = "Auxiliary Custodial"; id = "ringers_custodialaux"; @@ -64260,8 +64260,8 @@ dir = 5; icon_state = "corner_white" }, -/obj/item/device/versebook/trinary, -/obj/item/device/versebook/trinary, +/obj/item/versebook/trinary, +/obj/item/versebook/trinary, /obj/item/clothing/mask/trinary_mask, /obj/item/clothing/mask/trinary_mask, /obj/item/clothing/mask/trinary_mask, @@ -64431,7 +64431,7 @@ /obj/machinery/atmospherics/pipe/tank/carbon_dioxide/scc_shuttle{ dir = 4 }, -/obj/item/device/gps/stationary/sccv_quark{ +/obj/item/gps/stationary/sccv_quark{ pixel_x = -23 }, /turf/simulated/floor/plating, @@ -65048,7 +65048,7 @@ pixel_x = -9; pixel_y = 10 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 5; pixel_y = -2 }, @@ -65321,7 +65321,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/item/device/camera, +/obj/item/camera, /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenobiology/foyer) "iHD" = ( @@ -65472,7 +65472,7 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/meeting_room) "iIR" = ( -/obj/item/device/flashlight/lamp/lava/purple{ +/obj/item/flashlight/lamp/lava/purple{ pixel_y = 8; pixel_x = -8 }, @@ -65614,7 +65614,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled, /area/horizon/operations/office) "iJW" = ( @@ -66777,7 +66777,7 @@ /area/shuttle/mercenary) "iSq" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/device/radio/intercom/expedition/west, +/obj/item/radio/intercom/expedition/west, /obj/structure/table/stone/marble, /obj/machinery/light/small, /obj/machinery/appliance/cooker/microwave{ @@ -67271,7 +67271,7 @@ /obj/effect/floor_decal/corner/purple/full, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/vending/wardrobe/jani_wardrobe, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled, /area/horizon/service/custodial) "iVZ" = ( @@ -67948,9 +67948,9 @@ }, /obj/structure/table/standard, /obj/machinery/recharger, -/obj/item/device/camera_film, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera, /obj/machinery/camera/network/second_deck{ c_tag = "Second Deck - Tool storage"; dir = 1 @@ -67997,7 +67997,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -68232,7 +68232,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/shuttle/dark_blue, /area/horizon/shuttle/escape_pod/pod1) "jck" = ( @@ -69048,7 +69048,7 @@ dir = 4 }, /obj/structure/table/stone/marble, -/obj/item/device/quikpay, +/obj/item/quikpay, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/kitchen) "jit" = ( @@ -69105,7 +69105,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/captain, /obj/item/gun/energy/lawgiver, /obj/item/card/id/centcom, @@ -69476,7 +69476,7 @@ pixel_x = -22 }, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/wrapping_paper, /obj/structure/table/reinforced/steel, /obj/item/folder/sec{ @@ -71078,27 +71078,27 @@ "jwU" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/steel, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 5 }, @@ -71624,7 +71624,7 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/wing/starboard/far) "jAJ" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -72337,7 +72337,7 @@ /area/shuttle/hapt) "jFR" = ( /obj/structure/table/standard, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -6 }, /obj/random/dirt_75, @@ -72900,8 +72900,8 @@ "jKx" = ( /obj/structure/table/standard, /obj/item/stack/packageWrap, -/obj/item/device/destTagger, -/obj/item/device/hand_labeler, +/obj/item/destTagger, +/obj/item/hand_labeler, /obj/item/stack/wrapping_paper, /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/ringer/north{ @@ -72981,7 +72981,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "jLi" = ( @@ -73336,8 +73336,8 @@ dir = 8; c_tag = "Telecommunications - Entrance" }, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, /obj/structure/table/rack, /obj/item/stack/nanopaste, /obj/effect/floor_decal/spline/plain/black{ @@ -73867,7 +73867,7 @@ name = "reinforced glass table"; table_reinf = "glass" }, -/obj/item/device/laser_pointer/red, +/obj/item/laser_pointer/red, /turf/unsimulated/floor/monotile, /area/antag/mercenary) "jRk" = ( @@ -74588,9 +74588,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/structure/table/reinforced/steel, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/controlroom) "jVB" = ( @@ -74730,7 +74730,7 @@ /area/horizon/engineering/reactor/supermatter/mainchamber) "jWl" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/price_scanner, +/obj/item/price_scanner, /obj/machinery/light{ dir = 1 }, @@ -74997,7 +74997,7 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = 6; pixel_y = 2 }, @@ -75355,8 +75355,8 @@ /obj/item/clothing/gloves/yellow/specialu{ pixel_y = 5 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor, /area/antag/burglar) @@ -75484,7 +75484,7 @@ /obj/structure/closet{ name = "materials" }, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) "kbl" = ( @@ -75618,7 +75618,7 @@ /obj/structure/table/steel, /obj/item/storage/belt/utility, /obj/item/clothing/head/welding, -/obj/item/device/flashlight/heavy, +/obj/item/flashlight/heavy, /obj/machinery/light{ dir = 8 }, @@ -75834,7 +75834,7 @@ /area/tdome/tdome1) "kdj" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 5; pixel_y = 13 }, @@ -75972,7 +75972,7 @@ /area/centcom/control) "kep" = ( /obj/structure/table/rack/retail_shelf, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/storage/toolbox/mechanical{ pixel_y = 13 }, @@ -76067,7 +76067,7 @@ /area/horizon/security/hallway) "keU" = ( /obj/effect/floor_decal/corner/green/full, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/tiled/white, /area/horizon/crew/washroom/deck_3) "keV" = ( @@ -76100,7 +76100,7 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 9 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light/floor{ dir = 8 }, @@ -76990,18 +76990,18 @@ /area/template_noop) "kkT" = ( /obj/structure/table/steel, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 6; pixel_y = 4 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -10; pixel_y = 8 }, /obj/effect/floor_decal/corner/red{ dir = 9 }, -/obj/item/device/radio/intercom/interrogation/broadcasting/west, +/obj/item/radio/intercom/interrogation/broadcasting/west, /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation) "kkV" = ( @@ -77402,7 +77402,7 @@ "knk" = ( /obj/structure/table/standard, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) "knm" = ( @@ -77558,8 +77558,8 @@ /area/horizon/medical/gen_treatment) "kof" = ( /obj/structure/table/standard, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera, /obj/effect/floor_decal/corner/beige{ dir = 10 }, @@ -77985,7 +77985,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled, /area/horizon/hallway/primary/deck_2/central) "krp" = ( @@ -78076,7 +78076,7 @@ name = "Shotgun permit" }, /obj/machinery/alarm/west, -/obj/item/device/quikpay, +/obj/item/quikpay, /obj/item/storage/box/fancy/matches, /obj/item/flame/lighter/zippo, /turf/simulated/floor/tiled/dark, @@ -78152,7 +78152,7 @@ pixel_x = -8 }, /obj/item/reagent_containers/glass/beaker/large, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = -20 }, /obj/machinery/requests_console/west{ @@ -78222,7 +78222,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, -/obj/item/device/multitool, +/obj/item/multitool, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 }, @@ -79029,7 +79029,7 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "kxx" = ( -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /obj/machinery/computer/ship/engines/terminal{ dir = 4 }, @@ -79349,7 +79349,7 @@ /obj/item/pinpointer/advpinpointer, /obj/item/rig_module/mounted/plasmacutter, /obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/under/syndicate/combat, /obj/item/gun/energy/rifle/pulse, /obj/item/gun/projectile/revolver/mateba, @@ -79814,7 +79814,7 @@ dir = 5 }, /obj/structure/table/standard, -/obj/item/device/slime_scanner{ +/obj/item/slime_scanner{ pixel_x = -11; pixel_y = 4 }, @@ -79874,7 +79874,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /turf/simulated/floor/carpet, /area/horizon/command/heads/hos) "kCt" = ( @@ -79926,7 +79926,7 @@ "kCM" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker/large, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 10 }, /obj/effect/floor_decal/corner_wide/orange{ @@ -80564,7 +80564,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/captain, /obj/item/gun/energy/lawgiver, /obj/item/card/id/centcom, @@ -81450,11 +81450,11 @@ pixel_x = 4; pixel_y = 7 }, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/megaphone/red{ +/obj/item/megaphone/red{ pixel_x = -2; pixel_y = 6 }, @@ -81778,7 +81778,7 @@ "kPg" = ( /obj/structure/platform, /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = -7 }, /obj/item/stock_parts/matter_bin, @@ -83215,7 +83215,7 @@ }, /obj/effect/floor_decal/corner/purple/full, /obj/item/stack/packageWrap, -/obj/item/device/destTagger, +/obj/item/destTagger, /turf/simulated/floor/tiled, /area/horizon/service/custodial) "kZa" = ( @@ -83732,7 +83732,7 @@ /obj/structure/table/reinforced/wood, /obj/item/folder/blue, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -83797,8 +83797,8 @@ icon_state = "pipe-c" }, /obj/structure/table/standard, -/obj/item/device/hand_labeler, -/obj/item/device/destTagger, +/obj/item/hand_labeler, +/obj/item/destTagger, /obj/effect/floor_decal/corner/brown{ dir = 6 }, @@ -85060,7 +85060,7 @@ /area/horizon/medical/icu) "lkN" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/light, /turf/simulated/floor/grass/no_edge, @@ -85107,7 +85107,7 @@ "llm" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/table/standard, -/obj/item/device/geiger, +/obj/item/geiger, /obj/effect/floor_decal/spline/plain/yellow, /turf/simulated/floor/plating, /area/horizon/engineering/reactor/indra/smes) @@ -85228,9 +85228,9 @@ /obj/structure/table/rack, /obj/item/storage/secure/briefcase, /obj/item/storage/briefcase/aluminium, -/obj/item/device/camera, -/obj/item/device/taperecorder, -/obj/item/device/megaphone/red, +/obj/item/camera, +/obj/item/taperecorder, +/obj/item/megaphone/red, /obj/item/clothing/accessory/holster, /obj/item/clothing/accessory/holster, /obj/item/clothing/accessory/holster/armpit, @@ -85535,7 +85535,7 @@ }, /area/centcom/legion) "loP" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, @@ -85646,7 +85646,7 @@ /obj/item/clothing/head/bandana/hydro{ pixel_x = 5 }, -/obj/item/device/analyzer/plant_analyzer{ +/obj/item/analyzer/plant_analyzer{ pixel_x = 1; pixel_y = 6 }, @@ -85748,12 +85748,12 @@ dir = 9 }, /obj/structure/table/rack, -/obj/item/device/radio/beacon{ +/obj/item/radio/beacon{ pixel_x = -4; pixel_y = -4 }, -/obj/item/device/radio/beacon, -/obj/item/device/radio/beacon{ +/obj/item/radio/beacon, +/obj/item/radio/beacon{ pixel_x = 4; pixel_y = 4 }, @@ -86229,7 +86229,7 @@ /turf/unsimulated/floor/wood, /area/antag/raider) "lse" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, @@ -86398,7 +86398,7 @@ /obj/item/stock_parts/subspace/amplifier, /obj/item/stock_parts/subspace/amplifier, /obj/item/stock_parts/subspace/amplifier, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/structure/table/reinforced/steel, /turf/simulated/floor/carpet/rubber, /area/horizon/tcommsat/entrance) @@ -86475,7 +86475,7 @@ /area/merchant_station) "ltX" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 7; pixel_y = 3 }, @@ -86683,7 +86683,7 @@ /area/horizon/maintenance/deck_2/wing/starboard/near) "lvA" = ( /obj/effect/floor_decal/carpet, -/obj/item/device/flashlight/lamp/holodeck{ +/obj/item/flashlight/lamp/holodeck{ light_color = "#C48A18"; light_power = 2; light_range = 14; @@ -86926,7 +86926,7 @@ pixel_x = -4; pixel_y = 18 }, -/obj/item/device/pin_extractor, +/obj/item/pin_extractor, /obj/machinery/light{ dir = 8 }, @@ -87343,7 +87343,7 @@ name = "Librarian" }, /obj/structure/bed/stool/chair/office/light, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -87375,7 +87375,7 @@ /area/horizon/hallway/primary/deck_2/starboard) "lAw" = ( /obj/structure/table/wood, -/obj/item/device/taperecorder, +/obj/item/taperecorder, /turf/simulated/floor/carpet, /area/horizon/crew/journalistoffice) "lAB" = ( @@ -88484,7 +88484,7 @@ pixel_y = 30; dir = 1 }, -/obj/item/device/quikpay, +/obj/item/quikpay, /obj/item/book/manual/barman_recipes{ pixel_x = 4; pixel_y = 5 @@ -88825,7 +88825,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_theatre) "lKd" = ( @@ -89340,7 +89340,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/atmos) "lNv" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" @@ -89524,27 +89524,27 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -4; pixel_y = -2 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -4; pixel_y = -2 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -4; pixel_y = -2 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -4; pixel_y = -2 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -4; pixel_y = -2 }, -/obj/item/device/flashlight/pen{ +/obj/item/flashlight/pen{ pixel_x = -4; pixel_y = -2 }, @@ -89616,7 +89616,7 @@ /obj/machinery/newscaster/security_unit/south, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/suit_cycler/hos/prepared, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/oxygen, /turf/simulated/floor/tiled/dark/full, /area/horizon/command/heads/hos) @@ -90084,7 +90084,7 @@ /obj/item/stack/cable_coil, /obj/item/wirecutters, /obj/item/weldingtool, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/cell/mecha/phoron, /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -91247,8 +91247,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/radio/intercom/west, -/obj/item/device/flashlight/lamp{ +/obj/item/radio/intercom/west, +/obj/item/flashlight/lamp{ on = 0 }, /turf/simulated/floor/tiled/white, @@ -91373,7 +91373,7 @@ /turf/unsimulated/floor, /area/centcom/bar) "mdY" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner_wide/green{ dir = 6 }, @@ -91491,9 +91491,9 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/paper_scanner, -/obj/item/device/quikpay{ +/obj/item/quikpay{ destinationact = "Operations" }, /obj/random/pottedplant_small{ @@ -91845,8 +91845,8 @@ pixel_x = -8; pixel_y = 8 }, -/obj/item/device/toner, -/obj/item/device/toner, +/obj/item/toner, +/obj/item/toner, /obj/item/paper_bin{ pixel_x = 5; pixel_y = 9 @@ -92330,27 +92330,27 @@ }, /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/steel, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -7; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 5 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 6; pixel_y = 5 }, @@ -93560,7 +93560,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ on = 0 }, /turf/simulated/floor/tiled/white, @@ -93670,16 +93670,16 @@ /obj/machinery/newscaster/south, /obj/effect/floor_decal/corner/dark_blue/full, /obj/structure/table/standard, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, +/obj/item/radio/off, /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, /obj/item/crowbar/red, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/item/flashlight, /turf/simulated/floor/tiled, /area/horizon/command/bridge/supply) "mty" = ( @@ -94109,7 +94109,7 @@ name = "adjusted reinforced window" }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 3 }, @@ -94276,7 +94276,7 @@ /obj/item/reagent_containers/extinguisher_refill/filled, /obj/item/reagent_containers/extinguisher_refill/filled, /obj/item/reagent_containers/extinguisher_refill/filled, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/effect/floor_decal/corner/yellow/full{ dir = 8 }, @@ -94413,7 +94413,7 @@ /obj/item/storage/box/fancy/crayons, /obj/item/storage/box/fancy/crayons, /obj/item/toy/figure/assistant, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner/beige{ dir = 6 }, @@ -94763,7 +94763,7 @@ dir = 4 }, /obj/structure/table/reinforced/wood, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -95557,7 +95557,7 @@ /area/centcom/holding) "mHi" = ( /obj/effect/floor_decal/corner/dark_blue/full, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light/small, /obj/machinery/photocopier, /turf/simulated/floor/tiled/dark, @@ -95679,7 +95679,7 @@ /obj/structure/table/rack/retail_shelf{ name = "storage shelf" }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = 5 }, /obj/item/stack/packageWrap, @@ -96226,7 +96226,7 @@ }, /obj/structure/table/rack, /obj/item/storage/box/samplebags, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/storage/box/gloves, /obj/machinery/camera/network/research{ c_tag = "Research - Xenoarchaeology Atrium 1"; @@ -96288,7 +96288,7 @@ pixel_x = 15; pixel_y = 10 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 5; pixel_y = -1 }, @@ -97026,7 +97026,7 @@ pixel_y = 32; pixel_x = -4 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 9; pixel_x = -13 }, @@ -97038,7 +97038,7 @@ pixel_y = 5; pixel_x = 1 }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_x = 5; pixel_y = -3 }, @@ -98038,7 +98038,7 @@ dir = 6 }, /obj/structure/table/reinforced/steel, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 3; pixel_y = 6 }, @@ -98977,7 +98977,7 @@ /turf/simulated/floor/tiled, /area/horizon/operations/break_room) "neW" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 }, @@ -99213,7 +99213,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_x = -2; pixel_y = 7 }, @@ -99658,7 +99658,7 @@ pixel_x = 3; pixel_y = -5 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = 9; pixel_y = 9 }, @@ -99673,7 +99673,7 @@ pixel_x = -7; pixel_y = 7 }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_x = 4; pixel_y = -7 }, @@ -99871,8 +99871,8 @@ /area/horizon/rnd/xenoarch/atrium) "nmh" = ( /obj/structure/table/wood, -/obj/item/device/megaphone/sec, -/obj/item/device/megaphone/sec, +/obj/item/megaphone/sec, +/obj/item/megaphone/sec, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -99993,11 +99993,11 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 12; pixel_y = 15 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 12; pixel_y = 7 }, @@ -100121,7 +100121,7 @@ /obj/item/weldingtool/largetank{ pixel_y = -12 }, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ frequency = 1213; name = "Intercom"; subspace_transmission = 1; @@ -100563,8 +100563,8 @@ "nsp" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/structure/table/steel, -/obj/item/device/flashlight/lamp, -/obj/item/device/hand_labeler, +/obj/item/flashlight/lamp, +/obj/item/hand_labeler, /obj/machinery/light{ dir = 8 }, @@ -100801,7 +100801,7 @@ /area/horizon/operations/machinist/surgicalbay) "ntL" = ( /obj/structure/table/standard, -/obj/item/device/firing_pin/test_range, +/obj/item/firing_pin/test_range, /obj/item/clothing/glasses/safety/goggles/science{ pixel_y = 10 }, @@ -100964,7 +100964,7 @@ dir = 4 }, /obj/machinery/firealarm/south, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled, /area/horizon/stairwell/starboard/deck_2) "nuP" = ( @@ -101403,7 +101403,7 @@ pixel_x = 2; pixel_y = 11 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 1; pixel_x = -8 }, @@ -102793,19 +102793,19 @@ pixel_y = 6 }, /obj/item/storage/box/handcuffs, -/obj/item/device/radio/headset/syndicate{ +/obj/item/radio/headset/syndicate{ pixel_x = 16; pixel_y = 6 }, -/obj/item/device/radio/headset/syndicate{ +/obj/item/radio/headset/syndicate{ pixel_x = 16; pixel_y = 6 }, -/obj/item/device/radio/headset/syndicate{ +/obj/item/radio/headset/syndicate{ pixel_x = 16; pixel_y = 6 }, -/obj/item/device/radio/headset/syndicate{ +/obj/item/radio/headset/syndicate{ pixel_x = 16; pixel_y = 6 }, @@ -103429,11 +103429,11 @@ pixel_x = 6; pixel_y = 18 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = 7; pixel_y = 3 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 1; pixel_x = -7 }, @@ -104291,7 +104291,7 @@ icon_state = "plank_shadow"; name = "floor planks" }, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ on = 0 }, /turf/simulated/floor/holofloor/wood{ @@ -105698,7 +105698,7 @@ /area/horizon/engineering/shields) "oci" = ( /obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/device/gps/stationary/sccv_intrepid{ +/obj/item/gps/stationary/sccv_intrepid{ pixel_x = -10; pixel_y = 25 }, @@ -107082,7 +107082,7 @@ /obj/structure/table/steel, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/hoist_kit, -/obj/item/device/multitool, +/obj/item/multitool, /obj/structure/railing/mapped{ dir = 8 }, @@ -107148,7 +107148,7 @@ pixel_x = 4; pixel_y = 9 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -6; pixel_y = -4 }, @@ -107158,7 +107158,7 @@ /turf/unsimulated/floor, /area/centcom/bar) "olL" = ( -/obj/item/device/radio/intercom/east{ +/obj/item/radio/intercom/east{ frequency = 1441; name = "Spec Ops Intercom"; pixel_y = 20 @@ -107990,7 +107990,7 @@ req_access = null }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/device/radio/intercom/expedition/west{ +/obj/item/radio/intercom/expedition/west{ pixel_y = -24; pixel_x = -10 }, @@ -109127,7 +109127,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ dir = 2; pixel_x = 0; pixel_y = -4 @@ -109405,7 +109405,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/item/device/camera, +/obj/item/camera, /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/corner/grey{ dir = 10 @@ -109457,7 +109457,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled/dark, /area/horizon/command/bridge/aibunker) "oBl" = ( @@ -109764,7 +109764,7 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_combat_training) "oDw" = ( -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 6 }, /obj/item/storage/box/syndie_kit/clerical{ @@ -110320,7 +110320,7 @@ /obj/structure/platform{ dir = 4 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -110730,7 +110730,7 @@ pixel_x = -6; pixel_y = 1 }, -/obj/item/device/flashlight/lamp/lava/red{ +/obj/item/flashlight/lamp/lava/red{ pixel_x = -7; pixel_y = 14 }, @@ -111328,7 +111328,7 @@ "oNI" = ( /obj/effect/floor_decal/corner_wide/paleblue/full, /obj/structure/closet/secure_closet/CMO, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/keycard_auth{ dir = 4; pixel_x = -27; @@ -111522,7 +111522,7 @@ "oOR" = ( /obj/structure/table/standard, /obj/machinery/alarm/north, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = 7; pixel_x = -3 }, @@ -111742,10 +111742,10 @@ /obj/structure/closet/secure_closet/evidence{ name = "closet" }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 5 }, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = 6 }, /obj/item/book/manual/wiki/security_space_law{ @@ -112322,7 +112322,7 @@ /area/centcom/control) "oUe" = ( /obj/structure/table/standard, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_x = -5; pixel_y = 4 }, @@ -112638,7 +112638,7 @@ pixel_x = 6; pixel_y = 7 }, -/obj/item/device/geiger, +/obj/item/geiger, /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/reactor/indra/monitoring) "oWz" = ( @@ -113360,7 +113360,7 @@ "pbE" = ( /obj/machinery/firealarm/south, /obj/structure/table/standard, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/stamp/denied, /obj/effect/floor_decal/corner/beige/full, /turf/simulated/floor/tiled, @@ -113482,7 +113482,7 @@ /area/horizon/hangar/intrepid) "pcV" = ( /obj/random/hardhat, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = -5 }, /obj/item/folder/yellow{ @@ -113621,7 +113621,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/shuttle/dark_blue, /area/horizon/shuttle/escape_pod/pod2) "pdN" = ( @@ -114916,11 +114916,11 @@ pixel_x = 6; pixel_y = 6 }, -/obj/item/device/magnetic_lock/security{ +/obj/item/magnetic_lock/security{ pixel_x = -6; pixel_y = 2 }, -/obj/item/device/magnetic_lock/security{ +/obj/item/magnetic_lock/security{ pixel_x = -6; pixel_y = 2 }, @@ -115253,7 +115253,7 @@ /obj/item/stack/rods/full, /obj/item/storage/toolbox/mechanical, /obj/random/tool, -/obj/item/device/radio/sci, +/obj/item/radio/sci, /obj/item/tent, /obj/machinery/alarm/shuttle/east, /turf/simulated/floor/plating, @@ -115290,7 +115290,7 @@ /obj/structure/table/standard, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/tubes, -/obj/item/device/lightreplacer, +/obj/item/lightreplacer, /turf/simulated/floor/tiled, /area/horizon/command/bridge/supply) "poS" = ( @@ -115397,7 +115397,7 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/investigations_hallway) "ppO" = ( -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/effect/floor_decal/corner/dark_blue{ dir = 9 }, @@ -115476,7 +115476,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, @@ -115984,8 +115984,8 @@ pixel_y = 2 }, /obj/item/storage/bag/inflatable, -/obj/item/device/flashlight/flare/glowstick/red, -/obj/item/device/flashlight/flare/glowstick/red, +/obj/item/flashlight/flare/glowstick/red, +/obj/item/flashlight/flare/glowstick/red, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor/plating, /area/centcom/distress_prep) @@ -115997,7 +115997,7 @@ /obj/machinery/atmospherics/unary/vent_pump/aux{ dir = 1 }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 5; pixel_x = -5 }, @@ -117036,7 +117036,7 @@ pixel_x = 6; pixel_y = 14 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -4; pixel_y = 10 }, @@ -117745,7 +117745,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion/starboard) "pHk" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 5; pixel_y = 14 }, @@ -118078,7 +118078,7 @@ dir = 9 }, /obj/structure/table/stone/marble, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_tribunal) "pJJ" = ( @@ -118798,7 +118798,7 @@ /obj/item/stack/cable_coil, /obj/item/wirecutters, /obj/item/weldingtool, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/cell/mecha/phoron, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -118859,13 +118859,13 @@ /obj/structure/window/reinforced/crescent{ dir = 8 }, -/obj/item/device/camera{ +/obj/item/camera{ desc = "A polaroid camera. This one has 'Kismet' scribled into the casing." }, -/obj/item/device/camera{ +/obj/item/camera{ desc = "A polaroid camera. This one has 'Petr' scribled into the casing." }, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = 3; pixel_y = -12 }, @@ -119140,28 +119140,28 @@ dir = 6 }, /obj/machinery/firealarm/east, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 8 }, -/obj/item/device/radio/off{ +/obj/item/radio/off{ pixel_x = 8 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = -4 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = -4 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = -4 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = -4 }, /turf/simulated/floor/tiled/dark, @@ -119508,7 +119508,7 @@ /area/horizon/maintenance/deck_3/aft/holodeck) "pUg" = ( /obj/structure/table/standard, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/tape_roll{ pixel_x = -14; pixel_y = 10 @@ -120876,7 +120876,7 @@ }, /obj/item/pen/red, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark/full, /area/horizon/operations/mining_main/refinery) "qdZ" = ( @@ -121044,7 +121044,7 @@ /area/horizon/service/custodial/auxiliary) "qeV" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = -4; pixel_y = 12 }, @@ -121825,14 +121825,14 @@ /turf/simulated/floor/tiled, /area/horizon/service/hydroponics/lower) "qlt" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 3; pixel_y = 3 }, /obj/item/storage/briefcase, -/obj/item/device/flash, +/obj/item/flash, /obj/item/storage/secure/briefcase, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Internal Affairs EFTPOS scanner" }, /obj/item/clothing/under/suit_jacket/really_black, @@ -121840,12 +121840,12 @@ /obj/item/clothing/shoes/laceup, /obj/item/clipboard, /obj/item/pen/multi, -/obj/item/device/camera, +/obj/item/camera, /obj/structure/closet/lawcloset, /obj/item/paper_scanner, /obj/item/folder/red, /obj/item/folder/yellow, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/stack/packageWrap, /turf/simulated/floor/carpet, /area/horizon/repoffice/consular_two) @@ -121865,8 +121865,8 @@ pixel_y = 2 }, /obj/item/storage/bag/inflatable, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/machinery/light{ dir = 4 }, @@ -122056,20 +122056,20 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/meeting_room) "qmm" = ( -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 6 }, /obj/structure/table/steel, @@ -122114,7 +122114,7 @@ /turf/simulated/floor/plating, /area/horizon/engineering/hallway/aft) "qmv" = ( -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/camera/network/supply{ c_tag = "Operations - Lower Warehouse 4"; dir = 1 @@ -122219,7 +122219,7 @@ /obj/item/stack/packageWrap{ pixel_y = 2 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) "qne" = ( @@ -122552,7 +122552,7 @@ /obj/item/pinpointer/advpinpointer, /obj/item/rig_module/mounted/plasmacutter, /obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/under/syndicate/combat, /obj/item/gun/energy/rifle/pulse, /obj/item/gun/projectile/revolver/mateba, @@ -124002,19 +124002,19 @@ pixel_x = -2; pixel_y = -4 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 4; pixel_y = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 4; pixel_y = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 4; pixel_y = 8 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 4; pixel_y = 8 }, @@ -124679,7 +124679,7 @@ dir = 10 }, /obj/structure/window/reinforced, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/structure/filingcabinet{ pixel_x = -9 }, @@ -124878,21 +124878,21 @@ /obj/effect/floor_decal/corner/purple/full{ dir = 4 }, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = -2; pixel_y = 8 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 4; pixel_x = 2; gpstag = "QRK01" }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = 1; pixel_x = 7; gpstag = "QRK02" }, -/obj/item/device/radio/intercom/expedition/east, +/obj/item/radio/intercom/expedition/east, /obj/machinery/recharger{ pixel_x = -5; pixel_y = 1 @@ -125847,7 +125847,7 @@ pixel_y = 2 }, /obj/effect/decal/fake_object/light_source/invisible, -/obj/item/device/paint_sprayer{ +/obj/item/paint_sprayer{ pixel_y = 9; pixel_x = 7 }, @@ -126232,7 +126232,7 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/tiled/white, /area/horizon/medical/ward/isolation) "qPn" = ( @@ -126557,10 +126557,10 @@ /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/full, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/multitool, -/obj/item/device/multitool, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/multitool, +/obj/item/multitool, /obj/machinery/light, /obj/effect/floor_decal/corner/red/diagonal, /obj/item/airbubble/syndie{ @@ -127788,8 +127788,8 @@ /area/horizon/command/bridge/upperdeck) "qZS" = ( /obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/unsimulated/floor, /area/centcom/legion/hangar5) "qZU" = ( @@ -127999,7 +127999,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/engineering/gravity_gen) "rbU" = ( -/obj/item/device/megaphone{ +/obj/item/megaphone{ pixel_x = -1; pixel_y = 16 }, @@ -128079,7 +128079,7 @@ pixel_x = 6 }, /obj/item/pen/black, -/obj/item/device/price_scanner{ +/obj/item/price_scanner{ pixel_x = 6 }, /obj/machinery/button/remote/blast_door{ @@ -128677,7 +128677,7 @@ /turf/simulated/floor/plating, /area/horizon/engineering/atmos/air) "rgE" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/structure/table/standard, /obj/item/storage/toolbox/electrical{ pixel_y = 8; @@ -129265,7 +129265,7 @@ /area/horizon/engineering/gravity_gen) "rks" = ( /obj/structure/table/standard, -/obj/item/device/binoculars, +/obj/item/binoculars, /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, @@ -129586,7 +129586,7 @@ "rme" = ( /obj/structure/table/wood, /obj/effect/floor_decal/corner_wide/green/diagonal, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -129815,14 +129815,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hangar/auxiliary) "rna" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 3; pixel_y = 3 }, /obj/item/storage/briefcase, -/obj/item/device/flash, +/obj/item/flash, /obj/item/storage/secure/briefcase, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Internal Affairs EFTPOS scanner" }, /obj/item/clothing/under/suit_jacket/really_black, @@ -129830,12 +129830,12 @@ /obj/item/clothing/shoes/laceup, /obj/item/clipboard, /obj/item/pen/multi, -/obj/item/device/camera, +/obj/item/camera, /obj/item/paper_scanner, /obj/item/folder/red, /obj/item/folder/yellow, /obj/structure/closet/lawcloset, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/stack/packageWrap, /turf/simulated/floor/carpet, /area/horizon/repoffice/consular_one) @@ -131226,7 +131226,7 @@ /area/horizon/engineering/reactor/supermatter/waste) "rxn" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/screwdriver{ pixel_x = -1; pixel_y = -12 @@ -131267,7 +131267,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /obj/structure/bed/handrail{ pixel_y = 2 }, @@ -131759,7 +131759,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ frequency = 1213; name = "Intercom"; subspace_transmission = 1; @@ -132664,16 +132664,16 @@ dir = 4 }, /obj/item/crowbar, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = 6 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = 6 }, -/obj/item/device/flashlight/heavy{ +/obj/item/flashlight/heavy{ pixel_y = 6 }, -/obj/item/device/camera, +/obj/item/camera, /obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/horizon/security/checkpoint2) @@ -132936,7 +132936,7 @@ /obj/item/storage/bag/inflatable{ pixel_y = 13 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/item/reagent_containers/weldpack{ pixel_y = -10 }, @@ -133203,10 +133203,10 @@ /obj/item/crowbar/red{ pixel_y = 6 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 7 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_y = 2 }, /obj/structure/railing/mapped, @@ -133702,16 +133702,16 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/device/toner{ +/obj/item/toner{ pixel_y = 5 }, -/obj/item/device/toner{ +/obj/item/toner{ pixel_y = -1 }, /obj/item/paper_scanner, /obj/item/stack/packageWrap, /obj/item/storage/box/fancy/candle_box, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/structure/closet/walllocker{ pixel_y = 32 }, @@ -133882,7 +133882,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/camera/network/security{ c_tag = "Security - Holding Cell A" }, @@ -134521,7 +134521,7 @@ pixel_x = -6; pixel_y = 4 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 2 }, /turf/simulated/floor/tiled/dark, @@ -135497,7 +135497,7 @@ /turf/simulated/floor/tiled/gunmetal, /area/horizon/operations/warehouse) "rZo" = ( -/obj/item/device/radio/intercom/south{ +/obj/item/radio/intercom/south{ pixel_y = 0; pixel_x = 1 }, @@ -135716,7 +135716,7 @@ pixel_y = -8 }, /obj/structure/table/reinforced/steel, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = 6; pixel_x = -4 }, @@ -137453,7 +137453,7 @@ /area/horizon/rnd/xenoarch/atrium) "slZ" = ( /obj/structure/table/standard, -/obj/item/device/multitool, +/obj/item/multitool, /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, @@ -137722,11 +137722,11 @@ /area/horizon/engineering/atmos/propulsion) "snO" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 9 }, -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, /turf/simulated/floor/holofloor/snow, @@ -138006,7 +138006,7 @@ /area/antag/actor) "sqV" = ( /obj/structure/table/steel, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_y = 2 }, /turf/unsimulated/floor, @@ -138055,29 +138055,29 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_y = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 4; pixel_y = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 8; pixel_y = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = -4 }, -/obj/item/device/flash, -/obj/item/device/flash{ +/obj/item/flash, +/obj/item/flash{ pixel_x = 4 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = 8 }, /obj/effect/floor_decal/corner/yellow{ @@ -138208,7 +138208,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/officer, /obj/structure/window/reinforced{ dir = 4 @@ -138222,7 +138222,7 @@ /obj/effect/floor_decal/corner_wide/orange{ dir = 6 }, -/obj/item/device/quikpay{ +/obj/item/quikpay{ destinationact = "Medical"; pixel_y = 7; pixel_x = -5 @@ -138369,7 +138369,7 @@ /obj/structure/table/standard{ no_cargo = 1 }, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/stack/packageWrap, /obj/effect/floor_decal/corner/brown/full, /turf/simulated/floor/tiled/gunmetal/full, @@ -138432,7 +138432,7 @@ c_tag = "Operations - Machinist Workshop Starboard 2"; dir = 1 }, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /obj/structure/platform{ dir = 8 }, @@ -139414,7 +139414,7 @@ /obj/structure/table/steel, /obj/item/paper_bin, /obj/item/pen, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled/dark, /area/horizon/hangar/control) "szJ" = ( @@ -139640,29 +139640,29 @@ /area/horizon/hangar/operations) "sBb" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare{ pixel_y = 5 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 5 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 5 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 5 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 5 }, -/obj/item/device/flashlight/flare{ +/obj/item/flashlight/flare{ pixel_y = 5 }, /turf/unsimulated/floor, @@ -139792,19 +139792,19 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = -2 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/hoist_kit{ pixel_y = 7 }, /obj/structure/table/rack, -/obj/item/device/binoculars/high_power{ +/obj/item/binoculars/high_power{ pixel_x = -2; pixel_y = -1 }, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/item/radio, +/obj/item/radio, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, /obj/machinery/recharger/wallcharger{ pixel_x = 28; pixel_y = 13 @@ -139818,7 +139818,7 @@ dir = 1 }, /obj/item/storage/bag/inflatable, -/obj/item/device/gps/stationary/sccv_canary{ +/obj/item/gps/stationary/sccv_canary{ pixel_x = 23; pixel_y = -9 }, @@ -140679,7 +140679,7 @@ dir = 8 }, /obj/structure/table/reinforced/steel, -/obj/item/device/quikpay{ +/obj/item/quikpay{ destinationact = "Operations"; pixel_y = 3 }, @@ -140953,11 +140953,11 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/item/device/integrated_electronics/wirer{ +/obj/item/integrated_electronics/wirer{ pixel_x = -3; pixel_y = 10 }, -/obj/item/device/integrated_electronics/debugger{ +/obj/item/integrated_electronics/debugger{ pixel_x = 5; pixel_y = 9 }, @@ -141333,7 +141333,7 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/wing/port/nacelle) "sLU" = ( -/obj/item/device/radio/intercom/west{ +/obj/item/radio/intercom/west{ frequency = 1213; name = "Intercom"; subspace_transmission = 1; @@ -142659,11 +142659,11 @@ /obj/item/gun/custom_ka/frame01/illegal{ pixel_y = -1 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = -8; pixel_y = -8 }, -/obj/item/device/flash{ +/obj/item/flash{ pixel_x = -8; pixel_y = -8 }, @@ -142700,7 +142700,7 @@ /obj/item/storage/box/fancy/candle_box, /obj/item/storage/box/fancy/candle_box, /obj/item/stack/packageWrap, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/machinery/light_switch/west, /turf/simulated/floor/tiled/dark, /area/horizon/service/chapel/office) @@ -142889,7 +142889,7 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/machinery/button/remote/blast_door{ dir = 1; id = "hangarlockdown"; @@ -142964,11 +142964,11 @@ /area/antag/mercenary) "sXl" = ( /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/full, /area/horizon/engineering/storage_eva) "sXm" = ( @@ -143768,7 +143768,7 @@ /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/clothing/accessory/badge/holo, /obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, +/obj/item/radio/headset/ert, /obj/item/clothing/head/beret/centcom/officer, /turf/unsimulated/floor{ icon_state = "dark_preview" @@ -144782,7 +144782,7 @@ /obj/structure/table/standard{ no_cargo = 1 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -14; pixel_y = 2 }, @@ -145286,7 +145286,7 @@ /turf/simulated/floor, /area/horizon/ai/upload_foyer) "tnL" = ( -/obj/item/device/radio/intercom/north{ +/obj/item/radio/intercom/north{ desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; @@ -145294,7 +145294,7 @@ syndie = 1 }, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_x = -4; pixel_y = 11 }, @@ -146386,7 +146386,7 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/shuttle/dark_blue, /area/horizon/shuttle/escape_pod/pod4) "tvi" = ( @@ -146481,14 +146481,14 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/firing_range) "tvI" = ( -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = 3; pixel_y = 3 }, /obj/item/storage/briefcase, -/obj/item/device/flash, +/obj/item/flash, /obj/item/storage/secure/briefcase, -/obj/item/device/eftpos{ +/obj/item/eftpos{ eftpos_name = "Internal Affairs EFTPOS scanner" }, /obj/item/clothing/under/suit_jacket/really_black, @@ -146497,7 +146497,7 @@ /obj/item/clipboard, /obj/item/pen/multi, /obj/structure/closet/lawcloset, -/obj/item/device/camera, +/obj/item/camera, /obj/item/stamp/denied, /obj/item/folder/blue, /obj/item/folder/white, @@ -146505,7 +146505,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/west, -/obj/item/device/destTagger, +/obj/item/destTagger, /obj/item/stack/packageWrap, /turf/simulated/floor/carpet, /area/horizon/repoffice/representative_one) @@ -146707,7 +146707,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/tiled, /area/horizon/operations/break_room) "txn" = ( @@ -146749,7 +146749,7 @@ pixel_x = 5; pixel_y = 13 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light{ name = "adjusted light fixture"; pixel_x = 16 @@ -150401,7 +150401,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/horizon/service/custodial/auxiliary) @@ -151095,7 +151095,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -151577,7 +151577,7 @@ pixel_x = 4; pixel_y = 5 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled, /area/horizon/medical/paramedic) "uhj" = ( @@ -152715,11 +152715,11 @@ /turf/unsimulated/floor, /area/centcom/legion) "uoL" = ( -/obj/item/device/flashlight/flare/torch, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch, +/obj/item/flashlight/flare/torch{ pixel_x = 5 }, -/obj/item/device/flashlight/flare/torch{ +/obj/item/flashlight/flare/torch{ pixel_x = 9 }, /turf/simulated/floor/holofloor/grass{ @@ -152952,7 +152952,7 @@ c_tag = "Mining - Locker Room" }, /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/storage/toolbox/mechanical, /obj/item/storage/belt/utility, /obj/item/stack/rods/full{ @@ -153076,11 +153076,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) "uqY" = ( -/obj/item/device/radio/intercom/north{ +/obj/item/radio/intercom/north{ listening = 0; name = "Custom Channel" }, -/obj/item/device/radio/intercom/north{ +/obj/item/radio/intercom/north{ frequency = 1343; name = "Private Channel" }, @@ -153625,7 +153625,7 @@ dir = 4 }, /obj/machinery/hologram/holopad, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /turf/simulated/floor/wood/walnut, /area/horizon/medical/smoking) "uuv" = ( @@ -154012,7 +154012,7 @@ /area/horizon/maintenance/deck_1/main/port) "uxj" = ( /obj/structure/closet/secure_closet/engineering_chief, -/obj/item/device/radio/intercom/south, +/obj/item/radio/intercom/south, /obj/machinery/requests_console/east{ announcementConsole = 1; department = "Chief Engineer's Desk"; @@ -154031,7 +154031,7 @@ /obj/effect/floor_decal/spline/plain/black{ dir = 6 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/starboard_compartment) "uxs" = ( @@ -154271,7 +154271,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/tiled/white, /area/horizon/medical/surgery) "uzz" = ( @@ -154592,7 +154592,7 @@ pixel_x = -7; pixel_y = 6 }, -/obj/item/device/flashlight/lantern{ +/obj/item/flashlight/lantern{ pixel_x = 6; pixel_y = 5 }, @@ -154609,7 +154609,7 @@ /turf/unsimulated/floor, /area/antag/mercenary) "uBS" = ( -/obj/item/device/geiger, +/obj/item/geiger, /obj/item/storage/box/fancy/med_pouch/radiation, /obj/machinery/light/small{ dir = 1; @@ -155227,7 +155227,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/item/device/radio/intercom/expedition/north, +/obj/item/radio/intercom/expedition/north, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/main_compartment) "uFD" = ( @@ -156522,7 +156522,7 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 9 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/machinery/light/floor{ dir = 8 }, @@ -156945,7 +156945,7 @@ /area/horizon/ai/upload_foyer) "uRk" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp{ +/obj/item/flashlight/lamp{ pixel_x = -11; pixel_y = 1 }, @@ -157204,7 +157204,7 @@ /obj/structure/window/reinforced/crescent{ dir = 1 }, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor, /area/centcom/ferry) "uSG" = ( @@ -157518,14 +157518,14 @@ /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, /obj/item/grenade/chem_grenade, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/igniter, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, -/obj/item/device/assembly/timer, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/igniter, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, +/obj/item/assembly/timer, /obj/structure/closet/crate/drop/grey{ desc = "A large, sturdy crate, that stores grenade components."; name = "grenade crate"; @@ -158462,8 +158462,8 @@ "vbH" = ( /obj/structure/table/standard, /obj/item/storage/bag/circuits/basic, -/obj/item/device/integrated_electronics/debugger, -/obj/item/device/integrated_electronics/wirer, +/obj/item/integrated_electronics/debugger, +/obj/item/integrated_electronics/wirer, /obj/effect/floor_decal/corner/mauve{ dir = 6 }, @@ -158800,10 +158800,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, /obj/item/tank/emergency_oxygen/double, @@ -159105,7 +159105,7 @@ /obj/item/stack/cable_coil, /obj/item/wirecutters, /obj/item/weldingtool, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /obj/item/cell/mecha/phoron, /obj/effect/floor_decal/industrial/warning, /obj/structure/table/rack, @@ -159113,7 +159113,7 @@ /area/antag/jockey) "vfN" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/box{ +/obj/item/flashlight/lamp/box{ on = 0 }, /turf/simulated/floor/holofloor/grass{ @@ -159306,8 +159306,8 @@ }, /obj/structure/table/steel, /obj/machinery/power/apc/low/north, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/simulated/floor/tiled/dark, /area/horizon/operations/mining_main/eva) "vhJ" = ( @@ -159848,14 +159848,14 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /obj/machinery/camera/network/security{ c_tag = "Security - Holding Cell B" }, /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_b) "vlL" = ( -/obj/item/device/radio/intercom/south{ +/obj/item/radio/intercom/south{ frequency = 1443; name = "Spec Ops Intercom" }, @@ -160091,7 +160091,7 @@ /area/horizon/maintenance/deck_2/wing/starboard) "vnE" = ( /obj/structure/table/fancy, -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ pixel_x = 1; pixel_y = 13 }, @@ -160223,7 +160223,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/pink{ +/obj/item/flashlight/lamp/lava/pink{ pixel_x = -4; pixel_y = 6 }, @@ -160628,7 +160628,7 @@ /obj/item/storage/box/fancy/donut{ pixel_y = 8 }, -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /turf/simulated/floor/tiled, /area/horizon/security/equipment) "vrR" = ( @@ -161040,14 +161040,14 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = -4 }, /obj/item/clipboard{ pixel_x = -6 }, /obj/item/stack/packageWrap, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled, /area/horizon/security/office) "vvQ" = ( @@ -161192,7 +161192,7 @@ /area/horizon/operations/machinist/surgicalbay) "vwS" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_y = 4; pixel_x = 12 }, @@ -161775,15 +161775,15 @@ "vBc" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/table/steel, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -4; pixel_y = 20 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 4; pixel_y = 12 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -4; pixel_y = 4 }, @@ -161877,7 +161877,7 @@ }, /obj/structure/railing/mapped, /obj/structure/table/reinforced/steel, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = 5 }, /obj/item/stack/packageWrap{ @@ -162152,7 +162152,7 @@ /obj/structure/table/rack{ dir = 8 }, -/obj/item/device/multitool, +/obj/item/multitool, /obj/item/cell/high{ charge = 100; maxcharge = 15000 @@ -162161,8 +162161,8 @@ charge = 100; maxcharge = 15000 }, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/flash, +/obj/item/flash, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, @@ -162745,7 +162745,7 @@ /obj/effect/floor_decal/corner/mauve{ dir = 5 }, -/obj/item/device/destTagger{ +/obj/item/destTagger{ pixel_y = 7; pixel_x = -3 }, @@ -163097,8 +163097,8 @@ /area/horizon/engineering/hallway/fore) "vKA" = ( /obj/item/storage/photo_album, -/obj/item/device/camera_film, -/obj/item/device/camera, +/obj/item/camera_film, +/obj/item/camera, /obj/structure/closet/secure_closet{ name = "\improper Journalist's closet"; req_access = list(70) @@ -163111,7 +163111,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/item/device/radio/microphone, +/obj/item/radio/microphone, /turf/simulated/floor/wood, /area/horizon/crew/journalistoffice) "vKB" = ( @@ -163365,8 +163365,8 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/item/device/hand_labeler, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/horizon/storage/primary) @@ -163402,7 +163402,7 @@ /obj/item/stack/material/steel/full, /obj/item/stack/material/bronze/full, /obj/item/stack/material/glass/full, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -166847,7 +166847,7 @@ /obj/item/stack/packageWrap{ pixel_y = 5 }, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/unsimulated/floor{ icon_state = "dark_preview" }, @@ -166868,7 +166868,7 @@ /obj/item/rfd_ammo, /obj/item/rfd/construction, /obj/item/rfd/construction, -/obj/item/device/multitool, +/obj/item/multitool, /obj/structure/table/steel, /turf/unsimulated/floor/plating, /area/centcom/specops) @@ -167075,7 +167075,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/item/device/flashlight/lamp/stage, +/obj/item/flashlight/lamp/stage, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_theatre) "wlz" = ( @@ -167085,7 +167085,7 @@ pixel_x = -7; pixel_y = 8 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = 4 }, /turf/simulated/floor/plating, @@ -167118,7 +167118,7 @@ /area/horizon/service/hydroponics) "wlD" = ( /obj/structure/table/standard, -/obj/item/device/paicard{ +/obj/item/paicard{ pixel_x = 5 }, /obj/effect/floor_decal/corner/mauve/full{ @@ -168179,7 +168179,7 @@ /area/horizon/hangar/auxiliary) "wrs" = ( /obj/structure/table/standard, -/obj/item/device/flashlight/lamp, +/obj/item/flashlight/lamp, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -168195,24 +168195,24 @@ /area/horizon/medical/surgery) "wrA" = ( /obj/structure/table/rack, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 4; pixel_y = 11 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 4; pixel_y = 7 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_x = 4; pixel_y = 3 }, -/obj/item/device/gps/science{ +/obj/item/gps/science{ pixel_y = -1; pixel_x = 4 }, /obj/machinery/alarm/north, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -8; pixel_y = 10 }, @@ -168591,8 +168591,8 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/main/starboard) "wtM" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /obj/item/rig_module/cooling_unit, /obj/item/rig_module/cooling_unit, /obj/structure/table/standard, @@ -170345,7 +170345,7 @@ pixel_x = -1; pixel_y = 10 }, -/obj/item/device/flashlight{ +/obj/item/flashlight{ pixel_x = -9; pixel_y = -1 }, @@ -171236,7 +171236,7 @@ }, /obj/structure/bed/stool/chair, /obj/effect/floor_decal/industrial/outline/security, -/obj/item/device/radio/intercom/north, +/obj/item/radio/intercom/north, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "wNh" = ( @@ -173216,17 +173216,17 @@ /obj/structure/table/rack, /obj/item/storage/toolbox/emergency, /obj/item/ladder_mobile, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = -4; pixel_y = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4 }, -/obj/item/device/radio{ +/obj/item/radio{ pixel_x = 4; pixel_y = 4 }, @@ -173306,7 +173306,7 @@ /turf/simulated/floor/reinforced/hydrogen, /area/horizon/engineering/atmos) "wZp" = ( -/obj/item/device/flashlight/lamp/green{ +/obj/item/flashlight/lamp/green{ on = 0; pixel_x = -3; pixel_y = 2 @@ -173553,7 +173553,7 @@ /obj/effect/floor_decal/corner_wide/green/full{ dir = 8 }, -/obj/item/device/mass_spectrometer{ +/obj/item/mass_spectrometer{ pixel_x = -7; pixel_y = 1 }, @@ -173680,7 +173680,7 @@ /area/horizon/command/heads/om) "xbA" = ( /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green, +/obj/item/flashlight/lamp/green, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, @@ -173939,7 +173939,7 @@ pixel_x = 10; pixel_y = 9 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -6; pixel_y = 7 }, @@ -174027,7 +174027,7 @@ }, /obj/machinery/light, /obj/item/stack/material/glass/full, -/obj/item/device/hand_labeler, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/dark, /area/horizon/service/chapel/office) "xdR" = ( @@ -174395,7 +174395,7 @@ pixel_x = -8; pixel_y = 3 }, -/obj/item/device/analyzer{ +/obj/item/analyzer{ pixel_x = 3; pixel_y = 8 }, @@ -174573,11 +174573,11 @@ /area/horizon/holodeck/source_emptycourt) "xhF" = ( /obj/structure/table/reinforced/steel, -/obj/item/device/camera_film{ +/obj/item/camera_film{ pixel_x = -7; pixel_y = 6 }, -/obj/item/device/camera{ +/obj/item/camera{ pixel_x = 4; pixel_y = 1 }, @@ -175123,7 +175123,7 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/operations/machinist) "xmu" = ( -/obj/item/device/radio/intercom/east, +/obj/item/radio/intercom/east, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 1 }, @@ -175150,7 +175150,7 @@ /area/horizon/engineering/atmos/storage) "xmB" = ( /obj/structure/table/steel, -/obj/item/device/multitool, +/obj/item/multitool, /obj/machinery/camera/network/research{ c_tag = "Research - Server Room" }, @@ -175579,7 +175579,7 @@ pixel_x = -4; pixel_y = 18 }, -/obj/item/device/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 2 }, /turf/simulated/floor/tiled/dark, @@ -176159,7 +176159,7 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/maintenance/deck_1/workshop) "xtJ" = ( -/obj/item/device/flashlight/lantern, +/obj/item/flashlight/lantern, /turf/simulated/floor/holofloor/beach/sand{ icon_state = "desert4" }, @@ -176298,10 +176298,10 @@ }, /obj/item/rig_module/cooling_unit, /obj/item/rig_module/cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -177392,12 +177392,12 @@ locked = 0; opened = 1 }, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, /obj/machinery/light/spot{ dir = 1; icon_state = "tube1" @@ -177689,7 +177689,7 @@ /area/horizon/rnd/xenobiology/dissection) "xEh" = ( /obj/structure/table/rack, -/obj/item/device/paint_sprayer, +/obj/item/paint_sprayer, /obj/random/tech_supply, /obj/random/tech_supply, /obj/item/hoist_kit{ @@ -177716,7 +177716,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/device/flashlight/lamp/lava/pink{ +/obj/item/flashlight/lamp/lava/pink{ pixel_x = -7; pixel_y = 13 }, @@ -178228,7 +178228,7 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/device/taperecorder{ +/obj/item/taperecorder{ pixel_x = -4; pixel_y = 5 }, @@ -179039,7 +179039,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/item/device/versebook/biesel, +/obj/item/versebook/biesel, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_biesel) "xNo" = ( @@ -180701,8 +180701,8 @@ /area/horizon/maintenance/deck_2/research) "xZO" = ( /obj/structure/table/standard, -/obj/item/device/integrated_electronics/wirer, -/obj/item/device/integrated_electronics/debugger, +/obj/item/integrated_electronics/wirer, +/obj/item/integrated_electronics/debugger, /obj/item/storage/bag/circuits/basic, /obj/machinery/light{ dir = 8 @@ -182038,7 +182038,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/item/device/radio/intercom/west, +/obj/item/radio/intercom/west, /obj/structure/flora/pottedplant{ icon_state = "plant-33" }, diff --git a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm index 50313ed22f3..453954c7a5a 100644 --- a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm +++ b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm @@ -800,8 +800,8 @@ /area/template_noop) "sX" = ( /obj/structure/table/rack/no_cargo, -/obj/item/device/vending_refill/coffee, -/obj/item/device/vending_refill/coffee, +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/coffee, /turf/template_noop, /area/template_noop) "sY" = ( @@ -1889,7 +1889,7 @@ /area/template_noop) "VW" = ( /obj/structure/table/rack/no_cargo, -/obj/item/device/vending_refill/smokes, +/obj/item/vending_refill/smokes, /turf/template_noop, /area/template_noop) "Wc" = ( diff --git a/maps/templates/distress/dominia.dmm b/maps/templates/distress/dominia.dmm index 0a784bdff76..6a9a1c31f25 100644 --- a/maps/templates/distress/dominia.dmm +++ b/maps/templates/distress/dominia.dmm @@ -65,11 +65,11 @@ "Z" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/security, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, -/obj/item/device/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, +/obj/item/versebook/tribunal, /obj/item/sign/painting_frame/goddess/soldier, /turf/unsimulated/floor, /area/centcom/distress_prep) diff --git a/maps/templates/distress/kataphracts.dmm b/maps/templates/distress/kataphracts.dmm index 1e5566d7d96..3466e6cc7ed 100644 --- a/maps/templates/distress/kataphracts.dmm +++ b/maps/templates/distress/kataphracts.dmm @@ -22,18 +22,18 @@ pixel_x = 4; pixel_y = -4 }, -/obj/item/device/debugger{ +/obj/item/debugger{ pixel_x = 2; pixel_y = -5 }, -/obj/item/device/debugger{ +/obj/item/debugger{ pixel_y = -5 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -2; pixel_y = -6 }, -/obj/item/device/multitool{ +/obj/item/multitool{ pixel_x = -4; pixel_y = -6 }, @@ -87,11 +87,11 @@ /obj/item/ammo_casing/slugger, /obj/item/ammo_casing/slugger, /obj/item/ammo_casing/slugger, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = -4; pixel_y = -6 }, -/obj/item/device/binoculars{ +/obj/item/binoculars{ pixel_x = 4; pixel_y = -6 }, diff --git a/maps/templates/distress/tcaf.dmm b/maps/templates/distress/tcaf.dmm index 0d625e5230b..64572ed8cf1 100644 --- a/maps/templates/distress/tcaf.dmm +++ b/maps/templates/distress/tcaf.dmm @@ -59,15 +59,15 @@ /obj/item/deployable_kit/legion_barrier, /obj/item/deployable_kit/legion_barrier, /obj/item/deployable_kit/legion_barrier, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, -/obj/item/device/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, +/obj/item/magnetic_lock/security/legion, /obj/item/deployable_kit/legion_turret{ name = "blaster turret assembly kit" },